a
Merge branch 'gh-pages' of https://github.com/Automic-Community/mail_solution into gh-pages

Conflicts:
	index.html
	stylesheets/automic_custom.css