validation
HZ
Merge branch 'develop' of https://github.com/es-stud-dp-ua/stud-portal into develop

Conflicts:
	Events/src/main/webapp/WEB-INF/views/addEvent.jsp
	Events/src/main/webapp/WEB-INF/views/editEvent.jsp
	Organisations/src/main/webapp/WEB-INF/views/addOrganisation.jsp
	Organisations/src/main/webapp/WEB-INF/views/editOrganisation.jsp
validation
validation
Merge
CouncilMembers(dao,service,model)
Merge branch 'justins' of https://github.com/es-stud-dp-ua/stud-portal into justins

Conflicts:
	NewsArchivePortlet/bin/src/main/resources/hibernate.cfg.xml
	eventsPortlet/bin/src/main/webapp/js/valid.js
	organisationsPortlet/bin/data/test.db.properties
	organisationsPortlet/bin/src/main/webapp/js/valid.js
	studyPortlet/src/main/java/ua/dp/stud/study/controller/CouncilController.java
	studyPortlet/src/main/java/ua/dp/stud/study/dao/CouncilDao.java
	studyPortlet/src/main/java/ua/dp/stud/study/dao/impl/CouncilDaoImpl.java
	studyPortlet/src/main/java/ua/dp/stud/study/service/CouncilService.java
	studyPortlet/src/main/java/ua/dp/stud/study/service/impl/CouncilServiceImpl.java