Martha change request.
Merge
Merge branch 'rails4' of github.com:CruGlobal/sp into rails4

Conflicts:
	app/assets/stylesheets/frontend.css.scss
	app/assets/stylesheets/theme.css