Added code for django compressor
Merge branch 'master' of https://github.com/The-WebOps-Club/fest-api

Conflicts:
	files/templates/base/base.html
Merge branch 'master' of github.com:The-WebOps-Club/fest-api
Added emoji in atwho
Fixed Issue #60. Half done emoticons for Issue #58