2.0.0
Merge branch 'dev' of https://github.com/mazebeat/Laravel4-Intelidata into dev

Conflicts:
	app/routes.php