Merge branch 'master' of https://github.com/evelyne24/AndroidWidgetsExt

Conflicts:
	gradle.properties
Merge branch 'master' of https://github.com/evelyne24/AndroidWidgetsExt