test
Merge branch 'master' of https://github.com/tamagodon/larmov

Conflicts:
	 - Copy.htaccess
	_mmServerScripts/MMHTTPDB.php
	_mmServerScripts/_notes/dwsync.xml
	_mmServerScripts/mysql.php
	_notes/dwsync.xml
	hook.php