JA NIKS
Merge branch 'master' of https://github.com/menboy/ATD_Login

Conflicts:
	.gitignore
	nbproject/private/private.xml