Lot of Changes JQuary and CSS
Merge branch 'Janis'

Conflicts:
	_notes/dwsync.xml
	img/website/candy.png
	img/website/logo.png
	index.php
	js/scripts.js
	style.css