Merge remote-tracking branch 'origin/elena'

Conflicts:
MOMA/nbproject/project.properties
MOMA/web/Friends.xhtml
MOMA/web/PersonalSpace.xhtml
MOMA/web/diaryList.xhtml
MOMA/web/forgotPwd.xhtml
MOMA/web/searchList.xhtml
MOMA/web/userHomePage.xhtml
MOMA/web/userInfoCompletion.xhtml
MOMA/web/viewDiary.xhtml
MOMA/web/viewPhoto.xhtml
MOMA/web/viewVideo.xhtml