some changes.
some again
merged

Conflicts:
	README.txt
	production.ini
synchro