Merge pull request #268 from hazendaz/master

Sonarqube, Java 6 Cleanup, Tabs to Spaces to conform to MyBatis