Merge pull request #54 from jorisvervuurt/master

Major changes in models and some other parts of the app.