Merge branch 'master' of https://github.com/LucindaX/AslEljava

Conflicts:
	empty.html
	lib.php
	nbproject/private/private.xml
	resources/css/style.css