commit for merging from the upstream
Merge remote-tracking branch 'upstream/master'
Fix Bug in EditCommand and TaskDetailController
comment out task
Merge remote-tracking branch 'upstream/master'
merge with working
Preparing to merge with Andhieka
attempt to resolve 1
Merge pull request #150 from andhieka/working

Created Help and Search Commands
added help png file, help controller and help fxml
Merge pull request #151 from liafailboy/working

added help png file, help controller and help fxml
supported help command. deleted the scroll bar from the help window and from the categories window
Merge pull request #153 from liafailboy/working

supported help command. deleted the scroll bar from the help window and ...
Refactor Category to have its own list for the tasks under the category
Merge pull request #149 from mikelimantara/master
icon bar changed
Merge pull request #154 from liafailboy/working

icon bar changed
Add year label in calendar, fix displaying floating task
Merge with Shotaro
Merge pull request #155 from mikelimantara/master

Add year label in calendar, fix displaying floating task