Changes made by Neven Solidov (neven@dir.bg).
Merge branch 'master' of https://github.com/skittle/TeamUp.git
Merge branch 'master' of https://github.com/skittle/TeamUp.git
Merge branch 'master' of https://github.com/skittle/TeamUp.git
Changes made by Neven Solidov (neven@dir.bg).