typo
changed DB
added a new table to mysql db
add allow origin header
Merge remote-tracking branch 'origin/master' into dev