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

Conflicts:
	Gemfile
	Gemfile.lock
updated dependencies