change view categories
Merge branch 'master' into ivan
change eclipse component
Merge branch 'master' into ivan
repair menu
translate page
translate page
fixed bug with parameters and translete
fix conflicts
cahnge localization through javascript
relocate admin pages
set to list
add file upload
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash

Conflicts:
	SSEL/pom.xml
	SSEL/src/main/java/com/softserve/entity/Block.java
	SSEL/src/main/webapp/WEB-INF/spring/data.xml
add
Add mockito, write first tests
parameterized tests
Add profile.jsp, and add controller for this page.
it works
Fix bug with validation test