Updating gemlock
Merge remote-tracking branch 'origin/master' into release

Conflicts:
	README.txt
Update Gemlock
Merge remote-tracking branch 'origin/master' into development
Merge remote-tracking branch 'origin/release' into development

Conflicts:
	README.txt
Merge branch 'development' of github.com:gorje001/auto_mobile_test into development