Changes?
Merge branch 'master' of https://github.com/jraguirre2013/SDAT-2013

Conflicts:
	yii/senqual/protected/views/user/_form.php
	yii/senqual/protected/views/user/update.php
	yii/senqual/protected/views/user/view.php