Keywords in search
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ekm/luxoft/service/KeywordService.java
	src/main/java/ekm/luxoft/service/impl/KeywordServiceImpl.java
	src/main/java/ekm/luxoft/service/impl/TeamServiceImpl.java
	src/main/java/ekm/luxoft/view/controller/KeywordController.java
	src/main/webapp/WEB-INF/pages/main/page.jsp