Docs update

Signed-off-by: stephane brossier <sbrossier@groupon.com>
Merge branch 'gh-pages' of github.com:killbill/killbill-docs into gh-pages

Conflicts:
	faq.html
	userguide.html