Added sms text for catalog
Merge branch 'sms'
Merge branch '20141210-homepage-image'
Removed dean and marketing positions from website
Merge branch '20141215-removed-jobs' into staging