Replaced deprecated function get_context_instance() with context_XXX::instance()
Merge commit '3cd9c557ab385e03298d8712415da21554945144' into dev-replace_deprecated
Merge branch 'master' into develop
Merge pull request #13 from emeneo/dev-replace_deprecated

Cool, thanks :)
Add more placeholders

Added more placeholders to confirmation/ cancellation email
Merge pull request #14 from emeneo/Add-more-placeholders-to-Notification-e-Mails

Add more placeholders
Merge pull request #17 from emeneo/develop

Develop
Update version.php
Merge remote-tracking branch 'upstream/master' into apply-v.1.3

Conflicts:
	lib.php