Cleaning up
New locator html
Merge pull request #58 from CruGlobal/dev

New locator html
Merge branch 'master' of github.com:CruWeb/patterns into r-dev

Conflicts:
	static/components/032-campus-locator.html