TDIS-78 - Fixed Reset password future problem
TDIS-78 - Fixed Reset password future problem
Removed netbeans reference in .gitignore
Merge branch 'Reset-Password'

Conflicts:
	.gitignore