Merge from master

Conflicts:
	CHANGELOG.markdown
Merge branch 'release' of github.com:gorje001/auto_mobile_test into release
Merge remote-tracking branch 'origin/release' into development

Conflicts:
	CHANGELOG.markdown
Updating gemlock
adding test file
Merge remote-tracking branch 'origin/development' into development#test_dev