changed versionCode and Name
added new dependencies
Merge branch 'master' of github.com:jleidgens/BaseAndroidApp

Conflicts:
	app/build.gradle