Added alexander's work
Merge branch 'master' of github.com:eladmallel/globalfacetime

Conflicts:
	shapers/facetime/templates/index.html