test
Merge branch 'master' of https://github.com/alsacreations/structure-type

Conflicts:
	_basic/assets/css/_config.less