check if tag is null
Merge branch 'master' of github.com:agentmetrics/AM

Conflicts:
	app/assets/javascripts/Model/Customer.coffee