merge
Merge branch 'master' of https://github.com/mahoihei/fyp-workflow

Conflicts:
	FYP/war/Client/showClientApplicationList.jsp
	FYP/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml