Merge branch 'dev-django-1.5.1' of https://github.com/open-machine-learning/mloss

Merging with dev version
ContentType removed from test dataset
Merge pull request #7 from kidzik/master

Test problem resolved.