Added Motivation Functionality
TICKET : https://github.com/charmeproject/charme_plugin/issues/10
Merge remote-tracking branch 'origin/master'

Conflicts:
	CHARMe_plugin/src/plugin/js/charme.web.controllers.js