Merge branches 'dev' and 'master' into dev
bugs fixed
Merge branches 'dev' and 'master'