** Switched to upstream java-faker
Merge branch 'develop' of https://github.com/otavanopisto/pyramus.git into develop
** Added Sonatype OSS repository
** Reverted previous commit
** Removed test that uses old Faker API
- Removed user types from resources
Merge branch 'develop' of https://github.com/otavanopisto/pyramus into usertyperemoval
- Added listByModulesAndStudent to CourseStudentDAO
- Changed BOM version reference to hardcoded version for compatibility
with different version numbering
- Fixed resource edit views
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)
** Removed all tranquil model dependencies
** Removed tranquil model entities
** Removed Tranquild model references from rest project
** Temporarily commented out rest service end-points
** Temporarily removed rest project tests (will be added back in near
future)
** Added generated drop and create sqls for rest integration tests
** Fixed ImportAPI to work with Java 1.6