Login Register Forgot password.
Gitignore changes.
Merge branch 'master' of https://github.com/jfaluvegi/delta

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
Merge branch 'merger'