Added robolectric and espresso
Changed packages around
Merge branch 'master' of https://github.com/ChuckL/template-android

Conflicts:
	template/build.gradle