Merge branch 'master' of https://github.com/cs2103aug2014-t11-1j/main into krystal
Fixed adding empty and null Strings.
Tray Functionality
Fixed editing empty and null Strings.
Merge remote-tracking branch 'origin/jiashun'
Resource loader
Added skeleton for TodayView list
Merge branch 'master' of https://github.com/cs2103aug2014-t11-1j/main into krystal
Added the clock

TimeLabel updates to current time every second
Animations

added animation handler for view changing
Make todayview work. "show today" for todayview, "show all" for all view
stuff

stuff
Merge remote-tracking branch 'origin/jiashun' into krystal

Conflicts:
	src/gui/controller/PhantomController.java
	src/logic/Add.java
	src/storage/TaskConverter.java
Bug fix: made showtoday / showall show the other view properly.
CommandLine utility

Shows previous and forward inputs when up and down keys are pressed
respectively
Merge branch 'jiashun' of https://github.com/cs2103aug2014-t11-1j/main into krystal
Animation bug fixing

Stopped sliding animation for focused view
Resolved errors with merging. Now todayView works and everything is initilised properly
Merge branch 'jiashun' of https://github.com/cs2103aug2014-t11-1j/main into krystal
major bug fix

Bug fixed for noon and midnight parsing