Updated populate db
Merge branch 'master' of github.com:joninvski/showcase_server
Merge branch 'master' of github.com:joninvski/showcase_server

Conflicts:
	populate_db.sql