new rails version
Merge pull request #591 from mib32/rails4

new rails version
Update index.html.erb

Fix the display of the user to use forem_name (optionally with link) instead of a raw object.to_s dump.
Merge pull request #595 from montanalow/patch-1

Update index.html.erb
Add ordering to categories
Add ordering to forums
Rails 4.1.6 support.
Merge pull request #600 from Loremaster/rails4

Rails 4.1.6 support.
Remove deprecation warning for emoji
Merge pull request #602 from pierallard/rails4

Remove deprecation warning for emoji
Bump devise dependency to 3.3.0
db:test:prepare is deprecated, so don't use it
lol mysql
Improve dummy app generation

By 'improve' I mean 'don't catastrophically fail if spec/dummy exists already'.

It also doesn't generate dev/prod databases now too, because dropping those makes people angry.
Merge pull request #599 from Jake0oo0/rails4

Sort forums and categories by order
Revert "Sort forums and categories by order"
Merge pull request #610 from radar/revert-599-rails4

Revert "Sort forums and categories by order"
Ignore jruby failures
Add ordering to categories
Add ordering to forums