changes
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	test/AccountsSpec.scala
Add cloudsettings in assemblies inputs json

Conflicts:
	project/Build.scala
	test/PredefCloudsSpec.scala
Merge pull request #56 from rajthilakmca/0.5

0.5