ทำ birthday เสร็จ
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties
	src/th/ac/kmitl/it/faceinfo/allfragment/AddContacts.java