Merge branch 'master' of https://github.com/vhuertahnz/bimsa

Conflicts:
application/views/layout/slideshow.php
Merge