Merging tnichols into master
(Joyce) Added password change functionality
Merge remote-tracking branch 'origin/master' into tnichols