Merge pull request #40 from baasbox/master

pull request from repository baasbox
Merge pull request #41 from baasbox/master

pull request from repository baasbox
Merge pull request #42 from baasbox/master

pull request from repository baasbox
Merge pull request #245 from giastfader/master

fixed #244 BaasBox ignores the orient.baasbox.backup.path parameter
Merge pull request #43 from baasbox/master

pull request from repository baasbox
fixed pushToken and insert disablePush method
Merge pull request #246 from lupatellimatteo/master

Fixed missing push token and create method for disable push notification
Upgrade to Play 2.1.5 closed #267
Merge pull request #268 from giastfader/master

Upgrade to Play 2.1.5 closed #267
Implemented the override feature for BaasBox settings
Settings overridden are not-editable by default
Console update to manage the overridden settings
test for overridden settings
Merge pull request #18 from baasbox/master

update from origin
Override app settings stored into the embedded DB #fixed 270
callback management when a setting is overridden
Merge branch 'override_settings'
Merge branch 'master' into play2.2.1

Conflicts:
	app/com/baasbox/Global.java
	app/com/baasbox/configuration/PropertiesConfigurationHelper.java
	project/plugins.sbt
merge global.java