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

Conflicts:
	css/apache-maven-fluido-1.3.1.min.css
	css/print.css
Merge remote-tracking branch 'origin/gh-pages' into gh-pages