Made maven project
Rebuild website
Merge branch 'master' into mavenize
removed target folder
completed mavenize merge
Merge branch 'mavenize' into develop
Merge branch 'develop'