small changes
fixed merge-issue
test
fixed merge-conf
fixed merge-conf
play
merge fix
fixing GUI
Merge branch 'master' of https://github.com/TobyPalmer/Agilen
Merge branch 'master' into hanna
GUI-stuff
fixed merge-conflict
Merge branch 'master' into hanna
fixat till så att inställningsvyn är snyggare samt feedback på när man har satt notifikationen
its now not possible to start tasks on other days than today
Merge branch 'master' into August
Refreshed the GUI for neworderactivity
improved visual feedback when creating a new order
Merge branch 'master' into chris
Merge branch 'master' into chris