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
Refreshed the GUI in neworderactivity
Merge branch 'master' of https://github.com/TobyPalmer/Agilen
fixed stuff
Merge branch 'master' of https://github.com/TobyPalmer/Agilen
merge conflict fixed
merge-fix