Planteamiento de la mainPage
Merge branch 'master' of github.com:ggalmazor/ngStart

Conflicts:
	src/main/modules/about/AboutController.js
	src/main/modules/about/about.html
	src/main/modules/about/about.js
	src/main/modules/navbar/NavbarController.js