working version dec11_12_13
Merge branch 'master' of https://github.com/Oblify/Server