Merge branch 'master' into feature-gradle
Extended the dependencies so build configurations, other than the
standard can also run.

Moved the properties to gradle.properties, so no error about deprecated
dynamic properties will appear.
Merge branch 'master' into feature-gradle

Conflicts:
	app/templates/_build.gradle
Merge pull request #346 from derLukers/feature-gradle

Feature gradle
Added line ending
Fixing the gradle build variables