entity
Merge branch '0.5' of github.com:boltphp/core into 0.5

Conflicts:
	src/bolt/models/entity.php
model work