Merge branch 'master' of github.com:webfwk/webfwk

Conflicts:
	Gemfile
	features/support/env.rb
Merge branch 'master' of github.com:webfwk/webfwk