init, method, service, ...
Merge branch 'master' of https://github.com/MagicCrudAngular/mgCrud.git

Conflicts:
	README.md
error de merge y vuelta a subir