Merge branch 'hotfix/readme_descriptions'
Merge branch 'release/1.1'
subingo agonia
Merge branch 'develop' into hotfixes/bug
ee
Merge branch 'master' into develop

Conflicts:
	404.html