added more events tracker in the bootstrap.js
Merge branch 'zs-ga-fixed'

Conflicts:
	public/javascripts/bootstrap.js