Fixed states and transitions
Merge branch 'master' of github.com:eladmallel/globalfacetime

Conflicts:
	shapers/facetime/templates/chat.html
	shapers/facetime/views.py