changes made for anand
Merge branch 'master' of github.com:francis-/AG

Conflicts:
	chrome/src/clj/chrome/core.clj