Add border to node image
Merge branch 'master' into 120

Conflicts:
	sites/all/modules/custom/idevels/idevels.module
Merge branch '120' into test