Merge branch 'master' of https://github.com/lgomide/slidesnap

Conflicts:
	app/build.gradle