Merge branch 'master' of https://github.com/jintrone/XCoLab into xcolab_refactoring
Tests environment almost ready, schema not created by default in db yet
Merge branch 'xcolab_refactoring' of https://github.com/jintrone/XCoLab into xcolab_refactoring