update JS files
Merge branch 'master' into develop

Conflicts:
	dist/js/groundwork.min.js
Merge pull request #2 from MarkRabey/develop

update JS files