clean codes.
udpated log.
added edit macros.
clean up.
..
.
don't flush stderr...
Merge branch 'master' into dev

Conflicts:
	src/main.c
Merge branch 'dev'