animation and hi-res photos
Merging

Merge branch 'master' of https://github.com/kunals1994/gateway

Conflicts:
	assets/index.html
	assets/list.html
	displayitems/models.pyc
	displayitems/views.py