merged in android changes; renamed the stout project
Merge branch 'master' of https://github.com/arylwen/terebi

Conflicts:
	README.md