more stuff
Merge branch 'master' of https://github.com/HammerHankinson/BaM-Change-Management

Conflicts:
	sites/all/modules/custom/trails/trails.module