netbean
Merge branch 'master' into development

Conflicts:
	index.php