Added gradle build
Merge branch 'feature/gradle-build' into feature/1.0

Conflicts:
	src/main/res/menu/activity_main.xml
	src/test/java/com/github/tomaatje/android/MainActivityTest.java
	src/test/java/com/github/tomaatje/android/settings/TomaatjeSettingsActivityTest.java
Fixing test and some git mess
Fixing test and some git mess round #2