Merge origin/master

Conflicts:
	nbproject/project.propertieshhjj
Merge origin/master

Conflicts:
	resources/ajax/log.txt
	resources/js/login.js
	user/add.php
Merge origin/master

Conflicts:
	resources/ajax/log.txt
	resources/js/login.js
	user/add.php