Update tag db
Merge branch 'master' of https://github.com/nicholashaydensmith/cruzcal

Conflicts:
	controllers/default.py
Merge branch 'master' of https://github.com/nicholashaydensmith/cruzcal