* Minor changes
Merge branch 'no-gui' of https://github.com/erikzenker/dob into origin/no-gui

Conflicts:
	src/main.cc
* Codingstyle, Comments, Destructors