BZ-UX working on loader animation
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap

Conflicts:
	src/main/js/noesis/bootstrap/portfolio/directives/portfolio.html