Points branch to feature/CDB-35
Points branch to dev branch of style submodule
Merge branch 'CDB-404' into release/2.1.3.4.2

Conflicts:
	app/assets/stylesheets/common