Add revision number to window title
Merge branch 'master' into scripts

Conflicts:
	Makefile
	src/example.cpp
Add git version into window title
Fix every single trailing whitespace at once