Upgraded JRuby to 1.7.8
Merge branch 'dev' of github.com:ari/jobsworth into dev
New rails has some security fixes
Properly update Rails.
Some more security patches for gems
Fixed i18n translation issues.
Merge branch 'dev' of github.com:ari/jobsworth into dev
Updated the jdbc gems to version 1.3.3
Merge pull request #456 from webstream-io/viks-upgrading-jdbc-gems

Updated the jdbc gems to version 1.3.3
Travis should not allow jruby to fail
Travis should work with rubygems 2.0 now
Fixed the issue with double records being created when the checkbox is selected on the resource_type edit page
This fixes http://squish.ish.com.au/tasks/19000/edit
Merge pull request #457 from webstream-io/viks-resource-type-attribute-entry

Fixed the issue with double records being created when the checkbox is s...
Fixed quish filter cogwheel display
Task [#17080]
This fixes http://squish.ish.com.au/tasks/17080
Merge pull request #461 from webstream-io/viks-commiting-for-Squish-filter-cogwheel-display

Fixed squish filter cogwheel display
Upgraded jruby-jars and warbler.
Upgrade to jruby 1.7.9 for a bunch of bug fixed. http://jruby.org/2013/12/06/jruby-1-7-9.html

In particular I've run into https://github.com/jruby/jruby/issues/1238 in my dev environment.
Create an admin user when initialising the database for the first time. Closes #454.
Merge remote-tracking branch 'origin/master' into dev
Link to correct task in the Gantt chart. Close #459.