Merge branch 'master' of git://github.com/nehaagarwald/ehrdclj into nehaagarwald-master

Conflicts:
	clover/templates/home.st