nuovi file
Merge branch 'master' of https://github.com/AtsOutOfScope/bugfree-octo-happiness

Conflicts:
	www/index.html~
	www/js/app.js~
	www/js/services.js~
	www/pages/chi_siamo.html~
	www/pages/gallery.html~
Merge branch 'master' of https://github.com/AtsOutOfScope/bugfree-octo-happiness
commit
Merge branch 'master' of https://github.com/AtsOutOfScope/bugfree-octo-happiness

Conflicts:
	www/js/controllers/DownloadController.js