added logout function
 modified dbhelper
Merge remote-tracking branch 'remotes/origin/mao2' into Nav

Conflicts:
	app/src/main/java/com/example/nav/listget/Activities/ListActivity.java