some controls
Merge branch 'master' of https://github.com/thorn0/tamadroid

Conflicts:
	app/views/main.html