all tests pass
Merge branch 'dev'

Conflicts:
	spec/helpers/messages_helper_spec.rb