Merge branch 'lareina-storage' of https://github.com/cs2103aug2014-W09-3j/main into lareina-storage

Conflicts:
	src/tareas/storage/StorageJUnitTest.java
	storage.json
Removed support for recurring task, made timed task and deadline task test fail, written code for testing floating tagged tasks
Added passing test for deadline tasks
Made last taskmanager test testing for ability to build timed task pass
added parameter for createFile
Merge branch 'lareina-storage'

Conflicts:
	src/tareas/storage/StorageReader.java
	storage.json
Merge branch 'delon-ui' into junhao-finish-unittesting

Conflicts:
	src/tareas/gui/DetailedClassViewGenerator.java
Added 30 failing test cases, skeleton for integration testing in controllerTests
Abstracted some stuff in controller into private methods, now supports search by showing task info to user through GUI
Removed backup and categorize support
Added new method for user to call /help, abstracted more methods in the controller and now waiting for support from the various places
Added more useful feedback for when command is not recognized or has slight errors
Added more useful feedback to the user for most action type except for editing and adding, pushing to github to allow others to see and support the actions that we need to support
added parameter for function to differentiate between testing and running
merge master
Merge branch 'master' into lareina-storage

Conflicts:
	src/tareas/controller/TareasController.java
	storage.json
added method to retrieve all today's task , tomorrow's tasks and undone tasks.
added case to retrieve all done tasks
add method to retrieve list of task on particular date
added comment for methods