minor changes
Merge branch 'master' of https://github.com/The-WebOps-Club/fest-api

Conflicts:
	files/templates/portals/general/admin_portal.html
Merge branch 'master' of https://github.com/The-WebOps-Club/fest-api
fixed a permissions bug.
Merge branch 'shaastra_production' of https://github.com/The-WebOps-Club/fest-api into shaastra_production