Keeping master clean
Merge branch 'master' into c++11

Conflicts:
	include/CLTimer.h
	src/CLTimer.cpp