Merge branch 'master' of https://github.com/green-button/green-button.github.io

Conflicts:
	Presentations/Green_Button_ThirdParty_July2014.pdf