refs 64374 フッターを表示するか否かを設定できるよう修正
refs 6485 ruby2.0でsimpleconvがrequire出来ない問題を修正。
Merge remote branch 'origin/master' into issue6450
refs 6276 Windows用psqlバックアップスクリプトを作成
delete keycode fixture
Merge branch 'master' of github.com:MiraitSystems/enju_trunk
library.rbの修正
refs 6210  NACSISレコードのインポート処理のサンプルコードを作成した
Merge remote-tracking branch 'origin/master' into issue6493
refs 6498 利用者の同姓同名登録を可能に
refs 6493 貸出延長処理の修正
Merge branch 'issue6493'
refs 6099 Ability control for Functions

Function: define controller and actions to control access
FunctionClass: define user group to operate same function control
FunctionClassAbility: define each abilities to access functions

Controllers controlled by the Ability control
  ApprovalsController
  BindingItemsController
  ItemsController
  ManifestationsController
  OrdersConroller
  SystemConfigurationsController
  UsersController
初期データの修正
set function_class_id to user
refs 6515 delete uniquness validation for Patron#full_name
Merge remote branch 'origin/master' into issue6450

Conflicts:
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
Merge remote branch 'origin/issue6450' into issue6450