Created java Web Application with Apache Tomcat 8.0 server
Merge origin/master