js
Merge branch 'master' of https://github.com/wrongkitchen/fs-leadarchitect

Conflicts:
	dev/scripts/modules/global.js
Icons Alignment
merge js/css conflict