bundle update
Merge branch 'p13' of github.com:ichylinux/daddy into p13

Conflicts:
	careerlife/Gemfile.lock
deviseバージョンアップ