Fixes ubuntu 12.10 build
Merge branch 'master' of https://github.com/pasgui/douml

Conflicts:
	genplugouts/deploy/deploy.pro
	src/CppGenerator/cpp_generator.pro
	src/CppReverse/cppreverse.pro
	src/ui/constructorinitializerdialog.cpp