Integrated broken db stuff
Merge branch 'master' of https://github.com/mbogochow/TeamToo