Merge branch 'master' into feature/collections
E_NOTICE fixes.
Adds invite, userpoints and userpoints_invite.
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.
Merge pull request #80 from tamasd/master

E_NOTICE fixes, module additions.
Fix conflict with master branch.