fix error in migration #394
Define default JNDI settings
Separate database config file for jruby
If we are running jruby then let's just pick up the right JNDI settings
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Avoid rake error when there is no servlet context
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev'

Conflicts:
	db/migrate/20120918100141_set_status_for_existing_milestones.rb
Pull most recent commit from the dev branch overriding the patches to master
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev