implement reset function
fix indent
Merge branch 'master' into access_1
Merge branch 'access_1' into access_2
Merge branch 'access_2' into access_3

Conflicts:
	server.c