merged develop into develop-ha

conflicts:
user.rb
user_spec.rb