Allow interchanging of task types with update
cleaned up logic folder, by removing unnecessary conditions
Merge branch 'master' of github.com:cs2103aug2014-w13-4j/main into pn-change-task-type

Conflicts:
	src/logic/Logic.java
	src/logic/LogicApi.java
Formatting
Fix tests
made condition checking for updating timed tasks better
Merge remote-tracking branch 'origin/pn-change-task-type'