Gritter and state machine
Merge branch 'master' of github.com:eladmallel/globalfacetime

Conflicts:
	shapers/settings.py