17 septiembre
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/Laravel4-Intelidata.iml
	.idea/misc.xml
	.idea/workspace.xml
	app/storage/logs/app.log
	app/storage/logs/logging.log
	app/storage/logs/query.log
	app/storage/views/3817efbe2ee4ccfb93c33b84edfc73f1
	app/storage/views/95b9a554a0b900dde6b8b55551090394