jquery i love you
Merge branch 'master' of github.com:diegosarmentero/tvstalker
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	tvstalker/tvstalker/common/views.py
	tvstalker/tvstalker/static/js/actions.js