Merge pull request #4 from thomasalrin/master

backup cookbook
Merge pull request #6 from thomasalrin/master

new chef-repo
Merge pull request #7 from thomasalrin/master

beaver to rabbitmq changes
Merge pull request #8 from thomasalrin/master

tosca init changes
Merge pull request #10 from thomasalrin/master

new cookbooks
megam_play-check
recipes changes
done
done
Merge pull request #12 from morpheyesh/master

recipes changed
set
frameworksdone
done
Merge pull request #14 from morpheyesh/master

Fixed all the major frameworks
op5 changes
Merge remote-tracking branch 'origin'

Conflicts:
	cookbooks/megam_akka/metadata.rb
java and riak working