added in production encoding password
Merge branch '7180_hashpasswords' into develop