Conflicts: .gitignore sails/README.md sails/Vagrantfile sails/install.sh sails/roles/database/README.md sails/roles/database/files/pictodb-schema.sql sails/roles/database/files/test-autismojaen.sql sails/roles/database/files/test-caja.sql sails/roles/mysql/tasks/main.yml sails/roles/server/tasks/main.yml sails/roles/server/vars/main.yml sails/roles/webapp/tasks/main.yml sails/src/package.json
