Merge pull request #39 from ercchy/master

changed partner with affiliated in badge creation form
Update badge_info_horizontal.html
Update badge_info_horizontal.html
Update forms.py
Rename services app to oembed
Add featured badges json feed
Update .travis.yml
Merge pull request #40 from dirkcuys/master

Generate JSON feed for featured badges. Rename services app to oembed