změněn changelog, config.neon, .htaccess a css files
Merge branch 'master' of https://github.com/AnnaMoudra/skyquality

Conflicts:
	README.md
	nbproject/private/private.xml
	www/css/screen.css