Merge branch 'master' of https://github.com/AgriLife/College-2013
Merge branch 'release/rc-1'
GCST-11 Switched to Google custom search engine
Updated version number
Merge branch 'hotfix/v1.01' into develop

Conflicts:
	src/style.scss