fixed database username/password
Moved data import to a separate changeset for visibility