Merge branch 'master' of /Users/maxputin/RubymineProjects/Domino with conflicts.
Merge remote-tracking branch 'domino/master'

Conflicts:
	.idea/workspace.xml
bug fixed