Merge branch 'master' into develop
Merge branch 'fix-datatable-dates' into develop
Merge branches 'develop' and 'master' of https://github.com/osamak/student-portal
About portal page now extends the appropriate template based on authentication status
Started new about students club page
Finalized about students club page
Additional Entypo icons
More accurate subtitle
About footer added
Merge branch 'about-pages' into develop
Merge branch 'develop'
Incorporate some server edits
Merge branch 'develop'