Uncomment repos
Add local maven repo to the tree
Merge branch 'master' into gson-testing