small change
Merge branch 'dev' of github.com:chazmead/Phire into dev

Conflicts:
	deploy/application/Bootstrap.php