EN-62 oneTimeEvent field added to Term, TermBuilder introduced, db changeset adding afmntd column added
EN-62 lastOccurrenceDate added to term, to indicate when a given periodic event stops, semesterEndDate added to enrollconfig, periodic events handled in marshaller
EN-62 Controller made aware of fields added to event/term/enrollconfig
EN-62 Semester end can now be setup on the screen
EN-62 FirstOccurrenceDate field added to Term, primefaces modified accordingly, term details dialog broke into two columns
EN-62 Proper handling of firstOccurrence implemented. Export of periodic terms implemented and tested. Views and db updated.
Merge branch 'master' into feature/periodic-export

Conflicts:
	enrollme-webapp/db/db-changelog.xml
	enrollme-webapp/src/test/java/pl/agh/enrollme/web/adminpanel/solverexport/preferences/AntPreferencesFileControllerIT.java
	enrollme-webapp/src/test/java/pl/agh/enrollme/web/adminpanel/solverexport/preferences/EnrollmeSolverPreferencesFileControllerIT.java
	enrollme-webapp/src/test/java/pl/agh/enrollme/web/controller/AntInputFileControllerTest.java
	pom.xml
	repo/org/primefaces/primefaces/3.5/primefaces-3.5.jar
	repo/org/primefaces/primefaces/3.5/primefaces-3.5.jar.md5
	repo/org/primefaces/primefaces/3.5/primefaces-3.5.jar.sha1
	repo/org/primefaces/primefaces/maven-metadata.xml
	repo/org/primefaces/primefaces/maven-metadata.xml.md5
	repo/org/primefaces/primefaces/maven-metadata.xml.sha1
EN-62 Fixed merge
EN-62 Fixed merge 2
Merge branch 'master' into feature/periodic-export

Conflicts:
	enrollme-webapp/db/db-changelog.xml
	enrollme-webapp/src/main/java/pl/agh/enrollme/model/EnrollConfiguration.java
	enrollme-webapp/src/main/webapp/WEB-INF/flows/admin/new-enrollment/basic-configuration/basic-configuration.xhtml
	enrollme-webapp/src/test/java/pl/agh/enrollme/service/export/marshalling/schedule/CalEnrollScheduleEventMarshallerTest.java
	enrollme-webapp/src/test/java/pl/agh/enrollme/web/adminpanel/solverexport/preferences/AntPreferencesFileControllerIT.java
	enrollme-webapp/src/test/java/pl/agh/enrollme/web/adminpanel/solverexport/preferences/EnrollmeSolverPreferencesFileControllerIT.java
EN-62 after merge fix
Properties fix
Merged in feature/periodic-export (pull request #119)

EN-62 (EN-275, EN-276, EN-277, EN-278)
EN-62 after review fix; term constraints logic taken from TermBuilder to Term constructor