added apt and tomcat
Merge branch 'dev1'