Merge 1
Merge branch 'master' of https://github.com/wjling/Catherine.git

Conflicts:
	src/com/app/ui/UserInterface.java