Putting the channel in the context of channel promos listing
Merge branch 'master' into change_list_context

Conflicts:
	opps/promos/views.py
Returning get_object_or_404 to queryset that the code is more semantic
Adding channel in the context of the post method of view on  promo detail
Merge pull request #2 from ervilis/change_list_context

Putting the channel in the context of channel promos listing