Merge branch 'master' into 25-roles-and-permissions

.gitmodules

README.rst

aleksis/core/__init__.py

aleksis/core/apps.py

aleksis/core/menus.py

aleksis/core/settings.py

aleksis/core/static/js/main.js

aleksis/core/static/js/search.js

aleksis/core/static/style.scss

aleksis/core/templates/core/about.html

aleksis/core/templates/core/base.html

aleksis/core/templates/search/search.html

aleksis/core/urls.py

aleksis/core/util/apps.py

aleksis/core/util/core_helpers.py

aleksis/core/views.py

apps/official/AlekSIS-App-Chronos

apps/official/AlekSIS-App-DashboardFeeds

apps/official/AlekSIS-App-Exlibris

apps/official/AlekSIS-App-LDAP