Merge branch 'master' of github.com:aventinesolutions/aventine-rails

Conflicts:
	Gemfile.lock