fixed conflicts
fixed conflicts
Bumped develop version to 0.5.0
resolved conflicts [ci skip]
Using puma instead of thin
Updated gems
Custom twitter-bootstrap-rails with BS 2.3.2 and FA 3.2.0
Merge branch 'release/0.5.0'