Cleaned up Codenarc errors; separated Gradle build folder
Merge remote-tracking branch 'origin/master'