fix order article add + test
Bumped new version: 3.3.0
migrate to Rails 4.0 (closes foodcoops#214)

Conflicts:
	Gemfile.lock
use encrypted cookies on new installations
make heroku work again
Bumped new version: 4.0.0
add configuration for default language