add automatic catching grid size in python script
Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/config.h
	src/grid_manager.cpp
	src/options.cpp
	src/out_results.cpp
	src/solver.cpp