Added in tag searching
Merge branch 'master' of https://github.com/NiJeLorg/follow-the-money

Conflicts:
	CashCity/models.py
	CashCity/static/CashCity/js/screenshot.js
	CashCity/templates/CashCity/base.html