ver 1.7.0 db 01_07_002
11092014
Merge branch 'master' into dev

Conflicts:
	mainwindow.cpp
	viewblank.cpp
замена заставки