changed settings to dev version
Merge branch 'master' of https://github.com/POWER-Morzh/lbm-gpu-1 into POWER-Morzh-master

Conflicts:
	src/main.c
Merge branch 'POWER-Morzh-master'
added shared memory optimization to collision, misc improvements