Before merging
Merged!

Conflicts:
	admin.dpr
	admin.dproj
	datasnap/sync_serv/server_sync.dproj
	melangecafe_serv.sql