El error de el jquery, somos subnormales.
Merge origin/master

Conflicts:
	Vagrantfile
	app/config/app.php
	app/config/auth.php
	app/config/cache.php
	app/config/mail.php
	app/config/queue.php
	app/config/session.php
	app/config/testing/cache.php
	app/config/testing/session.php
	app/config/view.php
	app/controllers/OtherUserController.php
	app/controllers/ServiceController.php
	app/controllers/user/UserController.php
	app/database/migrations/2013_02_05_024934_confide_setup_users_table.php
	app/database/migrations/2013_02_05_043505_create_posts_table.php
	app/database/migrations/2013_02_05_044505_create_comments_table.php
	app/database/migrations/2013_05_21_024934_entrust_permissions.php
	app/database/migrations/2014_05_19_135220_create_services_table.php
	app/database/migrations/2014_05_23_140935_create_valorations_table.php
	app/database/migrations/2014_05_23_150927_create_solicituds_table.php
	app/database/production.sqlite
	app/filters.php
	app/lang/en/admin/blogs/messages.php
	app/lang/en/admin/blogs/table.php
	app/lang/en/admin/comments/messages.php
	app/lang/en/admin/comments/table.php
	app/lang/en/admin/roles/messages.php
	app/lang/en/admin/roles/table.php
	app/lang/en/admin/users/messages.php
	app/lang/en/admin/users/table.php
	app/lang/en/admin/users/title.php
	app/lang/en/pagination.php
	app/lang/en/site.php
	app/lang/en/user/user.php
	app/lang/en/validation.php
	app/lang/es_ES/admin/roles/table.php
	app/lang/pt/admin/blogs/messages.php
	app/lang/pt/admin/blogs/table.php
	app/lang/pt/admin/comments/messages.php
	app/lang/pt/admin/comments/table.php
	app/lang/pt/admin/roles/messages.php
	app/lang/pt/admin/roles/table.php
	app/lang/pt/admin/users/messages.php
	app/lang/pt/admin/users/table.php
	app/lang/pt/admin/users/title.php
	app/lang/pt/pagination.php
	app/lang/pt/site.php
	app/lang/pt/user/user.php
	app/lang/pt/validation.php
	app/models/Comment.php
	app/models/Post.php
	app/models/Service.php
	app/models/User.php
	app/presenters/CommentPresenter.php
	app/presenters/PostPresenter.php
	app/presenters/UserPresenter.php
	app/routes.php
	app/start/artisan.php
	app/start/global.php
	app/start/local.php
	app/storage/.gitignore
	app/storage/cache/.gitignore
	app/storage/logs/.gitignore
	app/storage/meta/.gitignore
	app/storage/sessions/.gitignore
	app/storage/views/.gitignore
	app/tests/library/TestCase.php
	app/tests/views/site/pages/BlogArticleTest.php
	app/tests/views/site/pages/BlogTest.php
	app/views/admin/dashboard.blade.php
	app/views/admin/users/index.blade.php
	app/views/service/view_service.blade.php
	app/views/site/layouts/main.blade.php
	app/views/site/user/services/delete.blade.php
	app/views/site/user/services/edit.blade.php
	app/views/site/user/services/index.blade.php
	artisan
	bootstrap/autoload.php
	bootstrap/paths.php
	bootstrap/start.php
	composer.json
	phpunit.xml
	public/.htaccess
	public/assets/css/bootstrap-responsive.css
	public/assets/css/bootstrap.css
	public/assets/css/colorbox.css
	public/assets/css/datatables-bootstrap.css
	public/assets/css/less/master.less
	public/assets/css/less/variables-custom.less
	public/assets/css/wysihtml5/bootstrap-wysihtml5.css
	public/assets/css/wysihtml5/prettify.css
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
	public/assets/ico/apple-touch-icon-114-precomposed.png
	public/assets/ico/apple-touch-icon-144-precomposed.png
	public/assets/ico/apple-touch-icon-57-precomposed.png
	public/assets/ico/apple-touch-icon-72-precomposed.png
	public/assets/ico/favicon.png
	public/assets/img/datatables/sort_asc.png
	public/assets/img/datatables/sort_asc_disabled.png
	public/assets/img/datatables/sort_both.png
	public/assets/img/datatables/sort_desc.png
	public/assets/img/datatables/sort_desc_disabled.png
	public/bootstrap/js/affix.js
	public/bootstrap/js/alert.js
	public/bootstrap/js/button.js
	public/bootstrap/js/carousel.js
	public/bootstrap/js/collapse.js
	public/bootstrap/js/dropdown.js
	public/bootstrap/js/modal.js
	public/bootstrap/js/popover.js
	public/bootstrap/js/scrollspy.js
	public/bootstrap/js/tab.js
	public/bootstrap/js/tooltip.js
	public/bootstrap/js/transition.js
	public/favicon.ico
	public/index.php
	public/style.css
	public/style.scss
	readme.md
	server.php
	vagrant.sh
Merge origin/master

Conflicts:
	Vagrantfile
	app/config/app.php
	app/config/auth.php
	app/config/cache.php
	app/config/mail.php
	app/config/queue.php
	app/config/session.php
	app/config/testing/cache.php
	app/config/testing/session.php
	app/config/view.php
	app/controllers/OtherUserController.php
	app/controllers/ServiceController.php
	app/controllers/user/UserController.php
	app/database/migrations/2013_02_05_024934_confide_setup_users_table.php
	app/database/migrations/2013_02_05_043505_create_posts_table.php
	app/database/migrations/2013_02_05_044505_create_comments_table.php
	app/database/migrations/2013_05_21_024934_entrust_permissions.php
	app/database/migrations/2014_05_19_135220_create_services_table.php
	app/database/migrations/2014_05_23_140935_create_valorations_table.php
	app/database/migrations/2014_05_23_150927_create_solicituds_table.php
	app/database/production.sqlite
	app/filters.php
	app/lang/en/admin/blogs/messages.php
	app/lang/en/admin/blogs/table.php
	app/lang/en/admin/comments/messages.php
	app/lang/en/admin/comments/table.php
	app/lang/en/admin/roles/messages.php
	app/lang/en/admin/roles/table.php
	app/lang/en/admin/users/messages.php
	app/lang/en/admin/users/table.php
	app/lang/en/admin/users/title.php
	app/lang/en/pagination.php
	app/lang/en/site.php
	app/lang/en/user/user.php
	app/lang/en/validation.php
	app/lang/es_ES/admin/roles/table.php
	app/lang/pt/admin/blogs/messages.php
	app/lang/pt/admin/blogs/table.php
	app/lang/pt/admin/comments/messages.php
	app/lang/pt/admin/comments/table.php
	app/lang/pt/admin/roles/messages.php
	app/lang/pt/admin/roles/table.php
	app/lang/pt/admin/users/messages.php
	app/lang/pt/admin/users/table.php
	app/lang/pt/admin/users/title.php
	app/lang/pt/pagination.php
	app/lang/pt/site.php
	app/lang/pt/user/user.php
	app/lang/pt/validation.php
	app/models/Comment.php
	app/models/Post.php
	app/models/Service.php
	app/models/User.php
	app/presenters/CommentPresenter.php
	app/presenters/PostPresenter.php
	app/presenters/UserPresenter.php
	app/routes.php
	app/start/artisan.php
	app/start/global.php
	app/start/local.php
	app/storage/.gitignore
	app/storage/cache/.gitignore
	app/storage/logs/.gitignore
	app/storage/meta/.gitignore
	app/storage/sessions/.gitignore
	app/storage/views/.gitignore
	app/tests/library/TestCase.php
	app/tests/views/site/pages/BlogArticleTest.php
	app/tests/views/site/pages/BlogTest.php
	app/views/admin/dashboard.blade.php
	app/views/admin/users/index.blade.php
	app/views/service/view_service.blade.php
	app/views/site/layouts/main.blade.php
	app/views/site/user/services/delete.blade.php
	app/views/site/user/services/edit.blade.php
	app/views/site/user/services/index.blade.php
	artisan
	bootstrap/autoload.php
	bootstrap/paths.php
	bootstrap/start.php
	composer.json
	phpunit.xml
	public/.htaccess
	public/assets/css/bootstrap-responsive.css
	public/assets/css/bootstrap.css
	public/assets/css/colorbox.css
	public/assets/css/datatables-bootstrap.css
	public/assets/css/less/master.less
	public/assets/css/less/variables-custom.less
	public/assets/css/wysihtml5/bootstrap-wysihtml5.css
	public/assets/css/wysihtml5/prettify.css
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
	public/assets/ico/apple-touch-icon-114-precomposed.png
	public/assets/ico/apple-touch-icon-144-precomposed.png
	public/assets/ico/apple-touch-icon-57-precomposed.png
	public/assets/ico/apple-touch-icon-72-precomposed.png
	public/assets/ico/favicon.png
	public/assets/img/datatables/sort_asc.png
	public/assets/img/datatables/sort_asc_disabled.png
	public/assets/img/datatables/sort_both.png
	public/assets/img/datatables/sort_desc.png
	public/assets/img/datatables/sort_desc_disabled.png
	public/bootstrap/js/affix.js
	public/bootstrap/js/alert.js
	public/bootstrap/js/button.js
	public/bootstrap/js/carousel.js
	public/bootstrap/js/collapse.js
	public/bootstrap/js/dropdown.js
	public/bootstrap/js/modal.js
	public/bootstrap/js/popover.js
	public/bootstrap/js/scrollspy.js
	public/bootstrap/js/tab.js
	public/bootstrap/js/tooltip.js
	public/bootstrap/js/transition.js
	public/favicon.ico
	public/index.php
	public/style.css
	public/style.scss
	readme.md
	server.php
	vagrant.sh