Merge branch 'master' of https://github.com/stevezau/lazy_client

Conflicts:
	lazy_client_ui/static/js/lazy.js
	lazy_client_ui/templates/downloads/downloaditem_detail.html