Merge branch 'master' into Janis
Merge branch 'master' into Janis
Merge branch 'master' into Janis
Lot of Changes.

+ JQuarry fixed
+ Mobile Navigation
Merge branch 'Janis'

Conflicts:
	_notes/dwsync.xml
	img/_notes/dwsync.xml
	img/website/_notes/dwsync.xml
	index.php
	js/scripts.js