global dev2
Merge branch 'dev/dev02' into dev/dev01

Conflicts:
	docroot/sites/all/themes/batcopy/sass/global.scss