IMAGE PROCESING INTEGRATIONE!!11
index.jsp edited
Merge remote-tracking branch 'origin/develop' into feature/ContentRepository
QQ!!!!!!!!!1122341234
QQ!!!!!!!!!1122341234234123512345
21234231513456135643512354135345
212342315134561356435123541353451234412352345345
2123423151345613564351235413534512344123523453451234314352345134534
AVADACEDAVRA
Merge remote-tracking branch 'origin/image-processing-integration-ui' into feature/ContentRepository

Conflicts:
	content-repository/src/main/java/com/softserveinc/ita/controller/RepositoryController.java
	content-repository/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
AVADACEDAVRA#2
AVADACEDAVRA#3
Merge remote-tracking branch 'origin/develop' into feature/ContentRepository
AVADACEDAVRA#3
Merge pull request #66 from combats/feature/ContentRepository

Feature/content repository almost done! Ui integrastion went good