Server stuff
Merge branch 'development' of https://github.com/crrnts/crrnts
commit master
Merge branch 'development' of https://github.com/crrnts/crrnts
Merge branch 'master' of https://github.com/crrnts/crrnts into dev