Merge from master

Conflicts:
	CHANGELOG.markdown
Test pdate
Merge pull request #15 from origin/release#testhotfix
Updating Changelog
Merge from release

Conflicts:
	CHANGELOG.markdown
Merge branch 'development' of github.com:gorje001/auto_mobile_test into development

Conflicts:
	CHANGELOG.markdown