Merge branch 'master' of github.com:ssidelnikov/sample_app into static-pages

Conflicts:
	.idea/workspace.xml