profile information + profile avatar
for openshift
for openshift
java version 1.7 for switch(String)
java compiler plugin -> 1.7
java7 for openshift
compiler for java 1.7
persistence for openshift
upload image for openshift
photo directory + default image
remove images from logos
login test disabled
for developers
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-dao/.settings/org.eclipse.jdt.core.prefs
	school-dao/src/main/java/school/dao/implementation/ParentDaoImpl.java
	school-service/.settings/org.eclipse.jdt.core.prefs
	school-ui-test/src/test/java/page/LoginPageTest.java
	school-web/.classpath
	school-web/.settings/org.eclipse.jdt.core.prefs