Enhancement 1425
Bug 1767
Merge branch 'master' of https://github.com/RaytheonWebSolutions/globe-gov-default-theme

Conflicts:
	README.txt