some styling that was added
Merge remote-tracking branch 'upstream/master' into upstream_master

Conflicts:
	badges/templates/p2pu_user/user_tile.html
Merge pull request #10 from ercchy/master

Some styling that was put in wrongly