Fixed database migration error, RSPEC now works
Small changes.
Merge branch 'dev' into navbar