Merge branch 'master' into dev
Merge branch 'master' into dev
Config for maven update, new gradle push script for gradle 0.11