Merge branch 'master' into chris
Created Backup activity
Added backup menu items
changed colors to variables
changed colors to variables
Merge branch 'master' of github.com:TobyPalmer/Agilen into chris
Added export button and implemented return message
Bug fix. Markera och avmarkera alla funkar ännu bättre. Total time funkar
JSON file also contains blocks with no order
Merged Master into Jimmie
Minor bug fix
gui fix in listactivity
merge fix
Nu funkar total time
Merge pull request #51 from TobyPalmer/felicia

Gui fix in List activity
Merge pull request #49 from TobyPalmer/chris

Lite mer bug fux
småfix
JSON export is updated to reflect database fully
Merged Master into Jimmie
Merge pull request #48 from TobyPalmer/Jimmie

Jimmie