Update changes
Merge branch 'develop' of github.com:plainblack/Lacuna-Server-Open into develop