cookbook for tomcat-nginx created
Merge remote-tracking branch 'ss/master'