[development test_travis] Fixes role error
[development test_travis] Fixes role error
Resolved Conflict
Merge branch 'test_travis' of github.com:Qwinix/bournville-api into test_travis

Conflicts:
	.travis.yml
[development test_travis] Fixes Database error
Merge branch 'test_travis' of github.com:Qwinix/bournville-api into test_travis
[development test_travis] Fixing Travis
Merge branch 'test_travis' of github.com:Qwinix/bournville-api into test_travis
Merge pull request #13 from Qwinix/test_travis

[development test_travis] Fixes role error