Bugfixes to pass previous tests.
Implemented search + filter (untested)
Merge branch 'master' of https://github.com/cs2103aug2014-w13-3c/main

Conflicts:
	efficiency/effiCommand/predParser.cpp