Rizwan 1015
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/includes/header.html
	Markup/Common/css/style.css
	Markup/Common/css/style.scss
	Markup/index.html