Merge origin/master

Conflicts:
	index.php
	nbproject/project.xml
Merge origin/master