use database in Contacts part
Merge branch 'master' of https://github.com/zhangw358/DormPen

Conflicts:

	android_navigationdrawerTest/app/src/main/java/com/example/dormpen/Helper/DBHelper.java