fix merge issues by greg
Merge branch 'master' of https://github.com/tdelesio/Leagues.git

Conflicts:
	ws-myp/src/main/webapp/_/js/test.js
	ws-myp/src/main/webapp/_/js/util.js