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

Conflicts:
	Gemfile.lock