Fixed a styling issue
Merge remote-tracking branch 'origin/master'
Re-sync database