Moved tomcat 8 up on build hierarchy
Merge branch 'origin/master'