Server fixes
Merge branch 'master' of github.com:matnel/euhackathon-2013