watch
Merge branch 'develop' of https://github.com/starteam/starcellbio_html into develop

Conflicts:
	html_app/watch.py