Merge branch 'release/cordova-brunch-0.3.1' into develop
Use prod for server:prod
Use prod for server:prod