Merge pull request #5 from ercchy/master

OBI integration merged
Merge pull request #6 from ercchy/master

Fixed bug with publishing badge
Merge pull request #7 from ercchy/master

Some styling that was forgotten
Merge pull request #8 from ercchy/master

We had a little typo
Merge pull request #9 from ercchy/master

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

Conflicts:
	badges/templates/p2pu_user/user_tile.html