Merge pull request #57 from thomasalrin/master

remove nginx for private
Merge pull request #58 from thomasalrin/master

init script changes
Merge pull request #64 from thomasalrin/master

start riak before gateway
Merge remote-tracking branch 'refs/remotes/origin/0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge remote-tracking branch 'origin/master' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5

f
serializationchange
Merge pull request #74 from morpheyesh/0.5

0.5
Add policies to asembly
Merge pull request #75 from rajthilakmca/0.5

Add policies to asembly
account + org tieup done
Merge pull request #76 from morpheyesh/0.5

account + org tieup done
Org Acc fix done
Merge pull request #77 from morpheyesh/0.5

Org Acc fix done
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	test/AccountsSpec.scala
Assemblies supports list action now.