camera
Merge branch 'master' of https://github.com/bachj3/MyBalance

Conflicts:
	config.xml
	js/page_balance.js
	page_balance.html