Markko/CSCI3130-Project — pull request #12 by Markko (2014-03-12 19:23:40+00:00)
Title: Merge master into server branch

update server brnach with the latest changes from master