forgot password backend complete except for sending email
can send password reset e-mail messages
Merge remote-tracking branch 'origin/master' into 397-forgot-password-plugin
Merge remote-tracking branch 'origin/master' into upgrade-infrastructure

Conflicts:
	core/plugins/model-securegraph/src/main/java/io/lumify/securegraph/model/user/SecureGraphUser.java