Merge pull request #11 from ThomasRahn/Development

Merge pull request #10 from ThomasRahn/master
blablabla
I hate github
Database test cases
Merge pull request #13 from ThomasRahn/Dror

Dror
Content test
Merge pull request #14 from ThomasRahn/Dror

Content test
Merge pull request #15 from ThomasRahn/master

merge drors tests to development