c1
c2
Merge branch 'c2' into debmv16_04-21-2014

Conflicts:
	book/crash.cpp
	book/function.cpp
got emacs mergetool working with xserver MobaXterm