setting up of play 2.2.1
Merge branch 'master' into play2.2.1
Migration to Play 2.2.1
fixed path of JsonNodeFactory
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
resolved conflicts
updated the last files to Play 2.2.1
Merge pull request #311 from eliantor/master

Api Access control
Merge pull request #312 from eliantor/master

Fixed java6 compatibility in PermissionTagDao
Merge pull request #313 from eliantor/master

Fixed all the java6 compat issues
Merge pull request #21 from baasbox/master

update from origin
merged with master
update to play 2.2.3
Fixed a typo on Permission API Access menu item
Fixes a typo on baasbox.data.read annotation tag
Merge pull request #22 from baasbox/master

update from origin
missing settings icon fixed
Fixed some erratic error on test related to the override settings feature
Fixed some erratic error on test related to the override settings feature