made an example split of the response for HTML/JSON
Merge remote-tracking branch 'upstream/master'
Account: add many-to-many relationship to conferences
draft implementation of the JSON parser for conferences
Merge pull request #16 from gicmo/user_db

Looks OK
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into andrey
build.sbt: add dependency for scalatest
Model: add prePersist method that assigns uuids
ConferenceService: implementation of list() and listOwn()

Replace spec2 test with JUnit like scalatest
ConferenceServiceTest: actually test something
Merge pull request #17 from stoewer/master

ConferenceService: started implementation

LGTM
DBUtil: utility functions for service classes using JPA
ConferenceService: use DBUtil

Use DBUtil also in unit test
ConferenceServiceTest: remove println() calls
draft implementation of the Serializer using built-in Format, Reads and Writes
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into andrey
Merge pull request #18 from stoewer/master

DBUtil: utility functions for classes and tests with JPA

LGTM
removed prototypes from the Conference controller