Task #151: Button add events
Merge branch 'master' into 151

Conflicts:
	sites/all/modules/custom/idevels/idevels.module
Merge branch 'master' into 141_1