Merge branch 'master' into feature/collections
Merge branch 'master' into feature/collections
Fix conflict with master.
Fix typo in code comment.
Merge pull request #81 from hosszukalman/feature/collections

Migrate old collections to the new one and delete old collections and the content types.