update for launch.
Merge branch 'master' of https://github.com/betheluniversity/cascade-php

Conflicts:
	profile-stories/php/profile_story_carousel.php