Corrected package
Merge remote-tracking branch 'origin/xjy-parser' into hyungjon-data
edit readme to warn about javadocs
Removed redundant file
add tasks
Added skeletal FileManager class
Modified classpath accordingly
Merge remote-tracking branch 'origin/sun-controller' into hyungjon-data
Merge remote-tracking branch 'origin/sun-maven' into hyungjon-data

Conflicts:
	.classpath
Merge branch 'sun-maven' into sun-controller
Merge remote-tracking branch 'origin/xjy-parser' into sun-controller
Merge branch 'master' of github.com:cs2103aug2014-w14-2j/main
change jdk to 1.7
move main method into controller
UI changed to call controller
command and parser class integrated with pretty time parser, taskType defined
add timed task and implement basic crud
Merge remote-tracking branch 'origin/xjy-UI_temp' into sun-controller
UI updateFloatingTasks method done
Merge remote-tracking branch 'origin/xjy-UI_temp' into sun-controller