Display Edit

Took out inappropriate text for presentation
Merge branch 'master' of https://github.com/jraguirre2013/SDAT-2013

Conflicts:
	yii/senqual/protected/views/site/index.php
change?