Re-Created some entities and changed the DB a bit
Merge pull request #22 from vasouv/recreate

Re-Created some entities and changed the DB a bit