updated dependencies
Merge branch 'master' of github.com:nabeta/enju_root

Conflicts:
	Gemfile.lock