fix sorting
fix sorting2
update
Merge branch 'master' of https://github.com/alex0x08/paster

Conflicts:
	shareService/webapp/.classpath
	shareService/webapp/.project
	shareService/webapp/.settings/.jsdtscope
	shareService/webapp/.settings/com.ibm.etools.webtools.packagepreferences.prefs
	shareService/webapp/.settings/org.eclipse.core.resources.prefs
	shareService/webapp/.settings/org.eclipse.jdt.core.prefs
	shareService/webapp/.settings/org.eclipse.ltk.core.refactoring.prefs
	shareService/webapp/.settings/org.eclipse.m2e.core.prefs
	shareService/webapp/.settings/org.eclipse.wst.common.component
	shareService/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
	shareService/webapp/.settings/org.hibernate.eclipse.console.prefs
	shareService/webapp/nb-configuration.xml
	shareService/webapp/nbactions-jetty6.xml
	shareService/webapp/nbactions.xml
	shareService/webapp/pom.xml
	shareService/webapp/src/main/java/uber/megashare/controller/SharedFileEditController.java
	shareService/webapp/src/main/java/uber/megashare/model/Project.java
	shareService/webapp/src/main/java/uber/megashare/model/SharedFile.java
	shareService/webapp/src/main/java/uber/megashare/model/Struct.java
	shareService/webapp/src/main/java/uber/megashare/model/User.java
	shareService/webapp/src/main/resources/ValidationMessages.properties
	shareService/webapp/src/main/resources/ValidationMessages_ru.properties
	shareService/webapp/src/main/webapp/WEB-INF/jsp/403.jsp
	shareService/webapp/src/main/webapp/WEB-INF/jsp/file/edit.jsp
	shareService/webapp/src/main/webapp/WEB-INF/jsp/login.jsp
	shareService/webapp/src/main/webapp/WEB-INF/jsp/profile/edit.jsp
	shareService/webapp/src/main/webapp/WEB-INF/jsp/project/edit.jsp
	shareService/webapp/src/main/webapp/WEB-INF/jsp/templates/common/auth-dropdown.jsp
	shareService/webapp/src/main/webapp/WEB-INF/jsp/templates/common/template-common-head.jsp
	shareService/webapp/src/main/webapp/WEB-INF/jsp/templates/common/user-dropdown.jsp
	shareService/webapp/src/main/webapp/WEB-INF/jsp/user/edit.jsp
	shareService/webapp/src/main/webapp/WEB-INF/spring/security.xml
	shareService/webapp/src/main/webapp/WEB-INF/web.xml
merge