??
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/innerheader.html
	views/slider.html