Pre-Commit
Merge origin/master

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
	public_html/default.htm
	public_html/error_log