refs 6101 master merged

Squashed commit of the following:

commit 3cda71b0f7b36e580ac3b3a3a16e23bbd17558a3
Author: morimoto002 <morimoto.tatsuya002@miraitsystems.jp>
Date:   Thu Jan 30 15:20:48 2014 +0900

    refs 6417 図書目録の出力のインデント修正

commit e3803cf6d6930627e1e537bc1cf308ad862a8258
Merge: c5bbe9c ab233ab
Author: morimoto002 <morimoto.tatsuya002@miraitsystems.jp>
Date:   Thu Jan 30 14:15:24 2014 +0900

    refs6417 図書目録の出力の修正

commit c5bbe9c86297d7e24390915c2772131e4adb2c84
Author: morimoto002 <morimoto.tatsuya002@miraitsystems.jp>
Date:   Thu Jan 30 14:10:58 2014 +0900

    refs6417 図書目録の出力の修正

commit ab233ab9b1d8d9c4f9b74ac4bd5d9cfcd5282a6b
Merge: 56b58d6 7c11ada
Author: Akifumi NAKAMURA <nakamura.akifumi@miraitsystems.jp>
Date:   Wed Jan 29 20:06:37 2014 +0900

    Merge branch 'master' of https://github.com/nakamura-akifumi/enju_trunk

commit 56b58d669e83937f72eded06526b26fc20cda3f0
Author: Akifumi NAKAMURA <nakamura.akifumi@miraitsystems.jp>
Date:   Wed Jan 29 20:04:15 2014 +0900

    production環境でRailsのログローテート機能を利用する。

commit 7c11ada78d505251572c48582ccd1ef1f89cd489
Author: Reiko Shinozuka <shinozuka.reiko@miraitsystems.jp>
Date:   Wed Jan 29 12:06:43 2014 +0900

    refs 6455 人物・団体画面にファセット機能を追加