fix for issue #133
Merge branch 'master' of github.com:deanhiller/playorm into gradle

Conflicts:
	gradle/wrapper/gradle-wrapper.properties