logging
Merge branch 'master' of https://github.com/jmvldz/sigma

Conflicts:
	static/js/controllers.js