animation
Merge branch 'master' of https://github.com/ajaxjquerytools/riskmap

Conflicts:
	client/index.html
Merge branch 'master' of https://github.com/ajaxjquerytools/riskmap