Organized Tomcat structure, added CheckBox test
Merge branch 'Nick_Sandbox' of https://github.com/ajbowler/M14 into Nick_Sandbox