Updated ...minutes ago by...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/internship/issuetracker/controller/RestIssueController.java
	src/main/java/internship/issuetracker/entities/Comment.java
	src/main/java/internship/issuetracker/entities/Issue.java
	src/main/java/internship/issuetracker/entities/Label.java
	src/main/java/internship/issuetracker/pojo/IssuePojo.java
	src/main/java/internship/issuetracker/repository/IssueLabelRepository.java
	src/main/java/internship/issuetracker/service/IssueService.java
	src/main/java/internship/issuetracker/service/LabelService.java
	src/main/java/internship/issuetracker/service/SearchService.java
	src/main/webapp/WEB-INF/views/main/issues.jsp
	src/main/webapp/WEB-INF/views/main/layout.jsp
	src/main/webapp/WEB-INF/views/main/tiles-definitions.xml
	src/main/webapp/resources/assets/stylesheets/style.css
	src/test/java/internship/issuetracker/repository/IssueLabelRepositoryTest.java
	src/test/java/internship/issuetracker/service/LabelServiceTest.java
Merge remote-tracking branch 'origin/master'