Latest
Merge branch 'master' of https://github.com/mrcapp/DemoApp5

Conflicts:
	www/assets/css/img/svg_info_toggle.svg
	www/assets/css/style.css
	www/our_community.html
	www/our_environment.html
	www/our_projects_feed.html
	www/share.html
	www/story_community_13million.html
	www/story_community_vip.html
	www/story_environment_egd.html
	www/story_environment_wind.html
	www/story_industry_oilsands.html
	www/story_industry_oilsands2.html
	www/story_operations_95.html
	www/story_operations_wrap.html
	www/story_projects_bakken.html
	www/story_projects_sunday.html
	www/story_safety_confined.html