TST
Merge remote-tracking branch 'origin/master'

a
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml
	centre.php
	css/_notes/dwsync.xml
	font-awesome-4.1.0/css/_notes/dwsync.xml
	font-awesome-4.1.0/fonts/_notes/dwsync.xml
	font-awesome-4.1.0/less/_notes/dwsync.xml
	font-awesome-4.1.0/scss/_notes/dwsync.xml
	fonts/_notes/dwsync.xml
	header-back.php
	images/_notes/dwsync.xml
	img/_notes/dwsync.xml
	inc/_notes/dwsync.xml
	js/_notes/dwsync.xml
	js/stickyMojo.js
	languages/_notes/dwsync.xml
	portal.php
	video/_notes/dwsync.xml