Updaint readme
Merge pull request #5 from origin/master#hotfix_master
Updating Changelog
Updating Changelog
Updating readme
Merge pull request #6 from origin/master#hotfix3
Updating Changelog
Merge from master

Conflicts:
	CHANGELOG.markdown
	README.txt