Merge pull request #1 from Brest-Java-Course/master

merge
Merge pull request #2 from Brest-Java-Course/master

fixed unit tests for mvc via using easymock
Merge pull request #3 from Brest-Java-Course/master

REST mock test fix
properties file name updated
Merge pull request #1 from vzhyhunou/master

properties file name updated