Changing alerts into updates
Merge branch 'master' of github.com:microcosm-cc/microweb

Conflicts:
	microcosm/api/resources.py
	microcosm/templates/microcosm.html