Changed GUI with Patrick
Modified DataController
Modified Help screen
Added tapped event at setting image
added stubs for DataController
fixed merge conflics
fixed broken reference
fixed merge conflics
sight can now be opend with hard coded data
Merge branch 'master' of https://github.com/man1utdfan/wander into Joris
changed textboxes to non editable
changed grid
Merge remote-tracking branch 'origin/GUI' into Joris
Implemented Settings and Help in Mainpage, only databinding left
Data binding with datacontroller for settings and help
Merge remote-tracking branch 'origin/GUI'
Merge remote-tracking branch 'origin/GUI'
Merge remote-tracking branch 'origin/Joris'
Added mediaplayer, still work in progress
Resolved merge conflict