converted to Gradle
cleanup
+ force java 1.6
Merge branch 'gradle'

Conflicts:
	.gitignore