enhancaed deploy script
Merge branch 'master' of github.com:yannickschuchmann/mamadata

Conflicts:
	mamadata_rails4/config/deploy/production.rb