op5 changes
Merge remote-tracking branch 'origin'

Conflicts:
	cookbooks/megam_akka/metadata.rb
java and riak working
Merge pull request #16 from thomasalrin/master

java and riak tested