Change comment style and solve conflicts
Minor fix.
Delete printf used to test experience formula.
Delete ugly arrow pointing to hero's face on window_actorinfo.cpp