upd
Merge branch 'master' of github.com:grsmv/selection-api

Conflicts:
	.idea/workspace.xml