Reworking trash so Mura orm entities can use it
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop