- Added listByModulesAndStudent to CourseStudentDAO
- Changed BOM version reference to hardcoded version for compatibility
with different version numbering
Merge branch 'develop' into analyzer-plugin

Conflicts:
	pyramus/pom.xml
 - Added RepositoryId to PluginRepository (need to set these manually at
next db update & restart)
 - Merged Plugin management and loading system from muikku project
(support for snapshot versions)
- Removed setting of content type for plugin resources (caused unknown
mime types to be served stupidly)
 - Added DynamicAttributes to ix:extensionHook
 - Drafting of access log
Merge branch 'develop' into accesslogger
 - Added options to disable logging
 - Added active option to disable logging for certain paths (useless
paths can be ignored)
 - Added update script
 - Removed BIRT libs preventing working
 - Changed to Java 1.7
 - Review changes
 - Extension hook for footer @ viewstudent
 - Removed references to non-existing project domainmodelextension
 - Version 0.6.5
 - Fixed orm.xml version to 2.0
 - Version 0.6.6-SNAPSHOT
 - Fix to reports having wrong locale
 - Moved sync block lower in filter as it keeps getting locked if socket
exception occurs inside the block
 - Version 0.6.6
 - Version 0.6.7-SNAPSHOT
Merge branch 'develop' into FTR-112

Conflicts:
	bom/pom.xml
	common/pom.xml
	persistence/pom.xml
	persistence/src/main/java/fi/pyramus/dao/base/ContactURLDAO.java
	persistence/src/main/java/fi/pyramus/dao/base/CourseBaseVariableKeyDAO.java
	persistence/src/main/java/fi/pyramus/dao/base/EducationSubtypeDAO.java
	persistence/src/main/java/fi/pyramus/dao/base/SchoolDAO.java
	persistence/src/main/java/fi/pyramus/dao/base/SchoolVariableDAO.java
	persistence/src/main/java/fi/pyramus/dao/base/SchoolVariableKeyDAO.java
	persistence/src/main/java/fi/pyramus/dao/base/StudyProgrammeCategoryDAO.java
	persistence/src/main/java/fi/pyramus/dao/base/StudyProgrammeDAO.java
	persistence/src/main/java/fi/pyramus/dao/projects/ProjectDAO.java
	persistence/src/main/java/fi/pyramus/dao/projects/ProjectModuleDAO.java
	persistence/src/main/java/fi/pyramus/dao/students/StudentDAO.java
	persistence/src/main/java/fi/pyramus/dao/students/StudentVariableDAO.java
	persistence/src/main/java/fi/pyramus/dao/students/StudentVariableKeyDAO.java
	persistence/src/main/java/fi/pyramus/domainmodel/base/ComponentBase.java
	persistence/src/main/java/fi/pyramus/domainmodel/base/ContactInfo.java
	persistence/src/main/java/fi/pyramus/domainmodel/base/CourseBase.java
	persistence/src/main/java/fi/pyramus/domainmodel/base/Municipality.java
	persistence/src/main/java/fi/pyramus/domainmodel/file/File.java
	persistence/src/main/java/fi/pyramus/domainmodel/projects/Project.java
	persistence/src/main/java/fi/pyramus/domainmodel/projects/StudentProject.java
	persistence/src/main/java/fi/pyramus/domainmodel/students/AbstractStudent.java
	persistence/src/main/java/fi/pyramus/domainmodel/students/Student.java
	persistence/src/main/java/fi/pyramus/domainmodel/students/StudentContactLogEntry.java
	persistence/src/main/java/fi/pyramus/domainmodel/students/StudentContactLogEntryComment.java
	persistence/src/main/java/fi/pyramus/domainmodel/students/StudentGroup.java
	persistence/src/main/java/fi/pyramus/domainmodel/students/StudentImage.java
	pom.xml
	pyramus/pom.xml
	rest/pom.xml
	rest/src/test/java/fi/pyramus/rest/test/RestfulServiceTest.java
** Updated test sql scripts to work with merged code