Merge remote-tracking branch 'origin/Mainliner' into UIWorkSD
Merge remote-tracking branch 'origin/Mainliner'
get the UI to tie into backend a bit
Remove extra debug stuff
Take the newest database
Merge branch 'master' of https://github.com/Nedlinin/SuperKidsDay
Merged changes in Server.cs
Merge remote-tracking branch 'origin/master' into Mainliner