add analytics
Merge branch 'analytics' of github.com:Blahah/solvers into Blahah-analytics

Conflicts:
	app/.meteor/packages
	app/client/router.js
	app/smart.json
	app/smart.lock