battery decreasing
Merge branch 'master' of https://github.com/thorn0/tamadroid

Conflicts:
	app/scripts/controllers/main.js
	app/views/main.html