Merge branch 'master' of https://github.com/alicht/asuciscolti

Conflicts:
	sites/all/modules/lti_consumer/lti_consumer.module