Merge branch 'production' into dev
Merge branch 'production' into dev
updated collation for vagrant mysql database
Merge branch 'dev' into production