Migrations modullos
Merge origin/master

Conflicts:
	app/database/migrations/2014_08_22_120333_CreateModulosTable.php