pom fix after merge
merge conflict resolution
merge conflict
merge conflict 3
Looks like very last fixed merge conflicts
Merge pull request #6 from eran2050/MVC-Volkov-1

Merge and make new Master MVC