Solved merge conflict
Merge branch 'master' of https://github.com/aspnetvnexthackathon/DrawingBoard
Lots of stuff