the
Merge branch 'develop' of https://github.com/drmiller21/RoboGuice into develop

Conflicts:
	AndroidManifest.xml
dasd