updating Gemfile and app.js
changed flatui version, js order
fixed conflicts with master