Update Java 6 to Java 7 and update Tomcat 6 to Tomcat 7

Conflicts:

	templates/server_setup_scripts/ubuntu_12.04_master_script.sh
	templates/server_setup_scripts/ubuntu_12.04_minimal_script.sh