Merge branch 'master' into stoewer-dev
File.hasSection(): comment on code part that causes compilation errors
Merge branch 'master' into stoewer-dev
Makefile: removed debug and release configuration
Makefile: remove small bug
Merge: resolve conflict in File.cpp
Merge branch 'master' into stoewer-dev
PandoraEntity: base class for pandora entities
SimpleTag: first draft of simple tag
PandoraEntity: implementation complete but untested.
SimpleTag: assignment operator removed
PandoraEntity: copyright header
Block: block now inherits from
PandoraEntity: small bug fixed in setUpdatedAt (tested in playground)
Merge branch 'master' of github.com:G-Node/pandora
Merge branch 'stoewer-dev'