testing rpc
Merge branch 'master' of https://github.com/diegosarmentero/tvstalker

Conflicts:
	tvstalker/tvstalker/common/views.py
post working
Merge branch 'master' of https://github.com/diegosarmentero/tvstalker