adding changes for admin updates
test.js merged
adding joinLeague.html
Merge remote-tracking branch 'origin/master'

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