updating labs
itemA done
itemA done
Revert "itemA done"

This reverts commit 64705bd3dc6090dc9569f48f97c8c9f341baaf52.
Merge origin/master

Conflicts:
	index.php
	nbproject/project.xml