Changes made by Martin Vladimirov (i9q19i@gmail.com).
Merge branch 'master' of https://github.com/skittle/TeamUp.git