merge
Merge branch 'master' of github.com:futuregrid/flask_cm

Conflicts:
	flask_cm/server.py