images for default content
Merge Gemfile.lock
fixed dump data, an page hadn't translate slug
Solve Gemfile merge conflict
not used
inventory and personal are not used at this time
fixed net-ssh version to 2.7.0
Fix site_bar link to admin and public site