Merge branch 'master' of github.com:maurotdo/cm14-symfony-skel

Conflicts:
	.gitignore
	LICENSE
	README.md