Merge branch 'master' of github.com:log0ymxm/epsilon-recommender

Conflicts:
	recommender/views.py
Merge branch 'master' of github.com:log0ymxm/epsilon-recommender

Conflicts:
	recommender/views.py