Exec bundle update
Merge branch 'rails4' of github.com:kaznum/sanataro into rails4

Conflicts:
	Gemfile.lock