Dev branch clean up.
Merge branch 'development' of https://github.com/broql/zap into development

Conflicts:
	public/img/icons/Thumbs.db