Security updates: Upgraded ctools to 7.x-1.4 and entity to 7.x-1.4 in springboard-core.make.
Merge branch '7.x-4.x' into 7.x-4.x-contrib-security-updates-2014-04

Conflicts:
	springboard-core.make
Merge pull request #21 from JacksonRiver/7.x-4.x-contrib-security-updates-2014-04

Security updates: Chaos Tools 1.4