merge
Merge branch 'master' of https://github.com/mixenik/phpSite

Conflicts:
	include/config.inc.php
	js/function.js
	js/slide_show.js
	nbproject/private/private.xml
merge