Merge branch 'hotfix/1.0.1'
Fix error displaying
update version
Merge branch 'hotfix/fixErrorDisplaying' into develop

Conflicts:
	index.php