Merge pull request #36 from moqui/master

Periodic sync back to base repo
Merge pull request #37 from moqui/master

Periodic upstream update
Merge pull request #38 from moqui/master

Periodic upstream update
Changed tasks.withType(Compile) to JavaCompile, since Compile has been depreciated in favor of JavaCompile and was finally removed in 2.0
Merge pull request #39 from shendepu/fix-gradle-compile-depreciation

Changed tasks.withType(Compile) to JavaCompile, since Compile has been d...
Merge remote-tracking branch 'upstream/master'