First commit to branch
No message
No message
Merge branch 'master' into quick_map_info

Conflicts:
	setting.cpp
Corrected drawing