Merge remote-tracking branch 'charlie/master' into charlie_integration

Conflicts:
	.classpath
	src/edu/uwm/cs361/fantastic_five/training_tracker/app/use_cases/ProgramCreator.java
	src/edu/uwm/cs361/fantastic_five/training_tracker/servlets/NewProgramFormServlet.java
	war/WEB-INF/pages/new_program_form.jsp