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
merged with master
update to play 2.2.3
merged master branch
Merge pull request #23 from baasbox/master

Merge pull request #316 from giastfader/master
Merge branch 'master' into play2.2.3
new baas sbt task to have a zip package similar to play 2.1.x
Merge pull request #317 from giastfader/play2.2.3

Porting to Play 2.2.3
fixed a bug returning a file in play 2.2.3
fixed problem with files test. It added a line feed at the end of the multipart body
removed unnecessary statement
Merge pull request #318 from giastfader/play2.2.3

fixed a bug that occurs when a file is returned  in play 2.2.3
updated Play version and command to build BaasBox