Close #239
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	style/annotations/list.less