test conmi1
Merge branch 'master' of https://github.com/khmersoftware/iosApplication

Conflicts:
	ListsDB.sqlite