Javascript

Javascript
Merge branch 'master' of https://github.com/cassidoo/Balance

Conflicts:
	app/src/main/bin/AndroidManifest.xml
	app/src/main/project.properties