changed date format
Merge branch 'master' of https://github.com/cs2103aug2014-t15-1j/main

Conflicts:
	src/gui/ResultGenerator.java
	src/gui/SetUp.java