和暦マスタを追加
issue-4576: NW-7 バーコード出力を暫定修正
空き thread 待ちの sleep を Thread.pass に変更
不要な require の削除、スレッド実行句内の一部調整
Merge pull request #26 from shaolin405mi16/issue-4576

issue-4576: NW-7 バーコード出力を暫定修正
admin can manage question
correct typo
Merge branch 'master' of github.com:nakamura-akifumi/enju_trunk
calc access log for top page with logged in user
refs 4163 add config option for reserve notification
refs 4510 export user list without telephone_type_id
Merge branch 'master' of https://github.com/nakamura-akifumi/enju_trunk
refs4661 インポートの修正
refs4411 不正なURL入力時の対処
Merge branch 'issue'
Merge remote-tracking branch 'akira/parallel_reindex'

Conflicts:
	lib/tasks/reindex.rake
Merge branch 'master' of https://github.com/nakamura-akifumi/enju_trunk
rfs 4652 add calendar input helper
refs 4712 no error without shelf on manifestation search results
refs4715 文献の件名登録のバグ修正
Merge branch 'issue'