Updated integration guide.
Merge branch 'master' of https://github.com/charmeproject/charme_plugin

Conflicts:
	CHARMe_plugin/dist/CHARMe Integration Guide 0.6.docx