Enhancement to DataModel layout
More exception handling
No real change (removed changed code.)
Merge branch 'test2' of https://github.com/AdamAtri/CardsAgainstHumanitySERVER.git