updates
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_content/annabelle/books-movies-more--ebooks-more.markdown
	_content/annabelle/books-movies-more--finding-items.markdown
	_content/bruce/resources--online-training-tutorials.markdown