Fixed quotation marks bug in database
Merge branch 'development'