Merge branch 'livefeed' of github.com:jdonaghue/ahgl-site into feature/featured_matches
Merge branch 'master' into carousel
Added methods to admin panel to mark selcted matches as featured.
Added featured attribute to the Match model
Added a new view class to retrieve featured matches for a given tournament or an aggragated list of featured matches
Added a url endpoint
Added migration file
-Add links to the footer and header
- Adding ability to click on tournaments or games
Removed the FeaturedMatchListView class from the tournament view.
Added an API endpoint for featured matches
Added a django-rest API endpoint, which fetches featured matches
-Add all the front end changes
-Remove file with the wrong naming convention
-Updated the background image
-Add a bit of protection to getting the background image
Merge branch 'master' into feature/featured_matches

Conflicts:
	ahgl/api/models.py
	ahgl/static/js/app/app/index.html
	ahgl/static/js/app/app/scripts/services/urls.js
	ahgl/urls.py
-Add ability to link through
Removed the field changes from migration files
Merge branch 'feature/featured_matches' of github.com:ahgl/ahgl-site into feature/featured_matches