Reformat according to Code Style - 4 spaces indent, no tabs
Improve model by adding non-business PK to all entities, and restrict access to setId()
Merge remote-tracking branch 'remotes/stian/master'