Merge branch 'master' of https://github.com/MiuCrew/MPI

Conflicts:
	src/main/java/ru/tuneit/mpi/beans/ClientBean.java
	src/main/webapp/views/clientHome.xhtml
	src/main/webapp/views/mainEditorHome.xhtml
	target/MPI-1.0-SNAPSHOT/views/clientHome.xhtml
	target/MPI-1.0-SNAPSHOT/views/mainEditorHome.xhtml
	target/maven-archiver/pom.properties