Imlement sort by start time
Fixed sort parsing bug
Merge branch 'master' of https://github.com/cs2103aug2014-f10-1j/main

Conflicts:
	src/parser/StreamParser.java