updated intellij files to include system_rules lib
Changed to one actionController and changed update
added testfx library
added testfxtest in tests and removed ambiguities in tasklistviewmanager
Tried to fix update method
Changed keyword parsing algorithm

to fix issue #156 and # 181
Changed date parsing algorithm for #156
Merge branch 'jin/gui' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui

Conflicts:
	src/app/viewmanagers/TaskListViewManager.java
Merge branch 'staging' into ryan/controller

Conflicts:
	src/app/controllers/ActionController.java
	src/app/controllers/CommandController.java
Fixed update/delete/done to work with search view
Added parsing for different display options
created new tests.integration folder and moved integration tests there, also created junit test suite
removed extra test libraries and tests
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
Merge branch 'jin/gui' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
changed default view to display only undone tasks

when app is first opened
removed unnecessary commented out code in InputFieldViewManager
changed commandKeywords to public in commandparser for autocomplete
Model now supports adding a trailing slash
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging