fixed weapper
Merge branch 'master' into develop
Material design with animations to come!

Conflicts:
	app/build.gradle
	gradle/wrapper/gradle-wrapper.properties