test doxygen
Merge branch 'dev'.
rename Continue.png to continue.png
use ugly #else #ifdef instead #elif for that the #elif can't compile on Ubuntu(who can tell me why?!).
Conflicts:
	src/app/mainwindow.cpp