error
disable normalization
merged
Merge branch 'oleg'

Conflicts:
	untitled-build-desltop_qt_4_8_5_x86-debug/vc100.pdb
	untitled/main.cpp