Conflicts:
	scss/ionic.app.scss
	www/css/ionic.app.css
	www/css/ionic.app.min.css
	www/i18n/locale-en.json
	www/i18n/locale-fr-FR.json
	www/js/controllers/home-controllers.js
	www/js/controllers/wallet-controllers.js
	www/js/services/utils-services.js
	www/js/services/wallet-services.js
	www/templates/account/view_wallet.html
	www/templates/currency/view_currency.html