I have change the header
Merge branch 'master' of https://github.com/yoda1490/AIT_SDQI_2013

Conflicts:
	Test_main.cpp