rails4.0 but order by prebrem
run bundle update rails
rails 4.1
merge develop
BugFix order by condition
update rake
Merge branch 'develop' of https://github.com/tamuratt/pjSearch into develop200

Conflicts:
	Gemfile.lock
bundle update
Merge pull request #120 from tamuratt/develop200

rails4にバージョンアップ