Mavenize

Mavenize
CRLF changes
FIx compile errors
Merge remote-tracking branch 'origin/master' into branch_1.1.1