ok
ok
Merge origin/master

Conflicts:
	.gitignore
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	web/index.jsp
	web/login.jsp
	web/login_control.jsp
	web/urunler/urunler.jsp