Merge branch 'hotfix/1.0.0'
Merge branch 'release/1.0.0'

Conflicts:
	.htaccess
Merge branch 'hotfix/1.0.0'
Merge branch 'release/1.0.1'

Conflicts:
	.htaccess
fixed rename banner_model file
Merge branch 'hotfix/deloy' into develop