Changes made by Cristian Vasile (cristi.mie@gmail.com).
Merge branch 'master' of https://github.com/skittle/TeamUp.git