Project built with c++11
Merge branch 'dev' into feature-uibuilder

Conflicts:
	build/qtass.pro