Test
Merge branch 'master' of https://github.com/2012SoftwareEngineering/CaseStudy

Conflicts:
	DemoOne/src/app/MyApplication.java