Fixed NoneType error
Merge branch 'master' into saarang_production
Strip newline in subject
Update utils.py
adding missing static statement
Fixed conflicts
Server edits
Merge branch 'master' of github.com:The-WebOps-Club/fest-api into mobile
Merge branch 'mobile' of github.com:The-WebOps-Club/fest-api into mobile

Conflicts:
	apps/api/mobile.py
Merge branch 'mobile' of github.com:The-WebOps-Club/fest-api into mobile
Merge branch 'mobile' of github.com:The-WebOps-Club/fest-api into mobile
server edits