Fixed em and security error on server load
new gems
Merge remote-tracking branch 'origin/design' into design