update rake
Merge branch 'develop' of https://github.com/tamuratt/pjSearch into develop200

Conflicts:
	Gemfile.lock