Merge branches 'develop' and 'master' of https://github.com/osamak/student-portal
Merge branch 'develop'
Merge branch 'develop'
due and overdue counter methods now only count reports for approved activities
Fix typo
Merge branch 'hotfix-issue-62'
Merge branch 'hotfix-issue-62' into develop
Add piwik code to base_userena
Merge branch 'hotfix-piwik-for-accounts' into develop
Selecting club members via the admin is now easier with filter_horizontal tool
Merge branch 'develop' of https://github.com/osamak/student-portal into develop