profile options
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-web/src/main/webapp/resources/css/profile.css
for nothing
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-web/src/main/webapp/resources/css/profile.css
for lv-128 java openshift
for openshift
for openshift
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git
for github
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git