Updated entity module to 1.5
Merge pull request #33 from lsolesen/entity

Updated entity module to 1.5