Updates gradle build.
Merge branch 'master' into gradle

Conflicts:
	app/pom.xml
	pom.xml
Converts to gradle.
Fixes for projects using this library.