Adds HTML aggregartor export
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	Gemfile.lock