struts2-inject
Merge remote-tracking branch 'blog/gh-pages' into gh-pages

Conflicts:
	CNAME