add set_state
Merge branch 'master' of github.com:iritmalka/braindj

Conflicts:
	braindj/urls.pyc
	braindj/views.pyc