Merge branch 'master' of http://gitlab.ujaen.es/yotta/pictogram

sails/src/CHANGES.md

-# Acciones a realizar
-
-- En /sails/src/assets lanzar "bower install"
-- En /sails/src lanzar "npm install"
-
-# Changes for new grid system
-
-- Lanzar desde MySQL el archivo roles/database/files/new-grid-system-adapt.sql
-- Reactivar triggers
-
-# Changes for logs rotation and reporting
-
-- Change permissions for logrotate.conf: chmod 644, chown root:root
-- Insert entry in crontab:
- `@daily /usr/sbin/logrotate -s /home/ubuntu/pictogram/sails/cron/logrotate.status /home/ubuntu/pictogram/sails/cron/logrotate.conf`