Added work time/break time cycle
App now saves the state between the 3 fragments
Basic navdrawer now back in GUI
Added comments to TasksEventsFragment
Back/up button now brings up the navigation drawer
Small fixes for the nav drawer and action bar
Small fixes..
Merge branch 'tabsPlusNavigationDrawer' into dev
Quick fix for tasks showing time
Merge branch 'dev' of https://github.com/simonjrp/ESCAPE into dev
Fix for updating edit/remove so tests work
Fixed bug with edit/remove buttons
Added notifications when timer reaches zero
Made changes to make the merge into dev work
Added NewBlockActivity and BlocksFragment
Merge branch 'autogeneratorFragment' into dev
Added documentation for meeting #10
Added documentation for meeting #11
Documentation updated
Merge branch 'dev' of https://github.com/simonjrp/ESCAPE into dev