--
Merge branch 'gh-pages' of https://github.com/chernikov-v/gloria into gh-pages

Conflicts:
	.idea/workspace.xml