Changed env variables and keeping branch up to date

In this merge we have:

1. changed database env variables all over the code, the new env vars are in the example env file
2. wrote initial code for seeding
3. changed some code for unit testing