Merge origin/master

Conflicts:
	database/MySql/PROCEDIMIENTO_NOTI.sql
	themes/abound/views/layouts/tpl_navigation.php
Signed-off-by:Angelleal <angeleal14@gmail.com>