Email Agregado

en el form y a la base de datos
Merge branch 'master' of https://github.com/jorgeaguirre/jrgadmin

Conflicts:
	application/controllers/edificios.php
Merge branch 'master' of https://github.com/jorgeaguirre/jrgadmin