Migrating changes from Develop to Staging server

in preparation for client meeting on 2 Apr 2014