"commited"
Merge branch 'master' of https://github.com/manilak/Microsite

Conflicts:
	waterimg.php