Merge branch 'gh-pages' of https://github.com/pmoskovi/kaazing-developer-network into gh-pages

Conflicts:
	_site/javascript/jekyll/update/2014/08/22/hello-peter/index.html
Committing conflicting files.