make commit to be able to merge branches
Merge branch 'master' into updates

Conflicts:
	sites/all/themes/merrimack/css/styles.css
merge master into updates
update core to 7.27
Merge branch 'updates'