develop branch
Merge branch 'develop'

Conflicts:
	static/less/main.less