CAMBIO TEMPLATE INICIAL "BASE"
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Resources/views/base.html.twig
	src/Armensa/BaseBundle/Resources/views/Default/index.html.twig
	web/css/animate.css
	web/css/bootstrap.css
	web/css/bootstrap.min.css
	web/css/main.css
	web/js/init.js
	web/js/jquery.scrolly.min.js
	web/js/skel.min.js