fixed admin template, synced DB
Merge remote-tracking branch 'origin/master'