Changed to one actionController and changed update
Tried to fix update method
Changed keyword parsing algorithm

to fix issue #156 and # 181
Changed date parsing algorithm for #156
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