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
Refreshed the GUI for neworderactivity
Merge branch 'master' into chris
Merge branch 'master' into chris
Merge branch 'master' into chris
Merge branch 'master' into chris
Translations
Refreshed the GUI in neworderactivity