remove support for injector name in content
Merge branch 'master' into SLICE-61

Conflicts:
	slice-core/src/main/java/com/cognifide/slice/core/internal/injector/InjectorsRepositoryService.java
Fixing merge
Merge pull request #40 from Cognifide/SLICE-61

SLICE-61 remove support for injector name in content