Remove flavour
Restore flavour
Remove flavour
Restore defaultflavor
Remove
asd
asd
Update android plugin verison
Fix wrapper
Add new target
Asd
Merge branch 'master' of github.com:lauriskr/greenhouse-android into dev

Conflicts:
	.DS_Store
	greenhouse-test/App/build.gradle
	greenhouse-test/gradle/wrapper/gradle-wrapper.properties