close #6. Search supported. Manipulate on search result supported. Close #90. Bug fixed.
Format the code.
Merge branch 'master' of https://github.com/CS2103TAug2014-W15-4J/main

Conflicts:
	src/controller/Logic.java