Map  displayed.
Merge branch 'Development' of https://github.com/perryao/TRAOWebsite into Development

Conflicts:
	public/styles/site.min.css
	public/styles/site/layout.less