offf

Merge branch 'master' of github.com:ygeorgiev/bashost

Conflicts:
	bashost/config/database.php
Merge branch 'master' of github.com:ygeorgiev/bashost