Updating JS calculations
Merge branch 'master' of https://github.com/revivemarketing/ELWeb

Conflicts:
	css/test.css
	index.html