trivial commit to jumpstart deploy
Merge pull request #280 from joanneci/19896

trivial commit to jumpstart deploy
add file type js to uploads
add file type js to uploads
Merge pull request #281 from joanneci/19896

change for opening js file type uploads
Merge branch 'master' of https://github.com/highfidelity/worklist into 19975

Conflicts:
	lib/classes/Fee.php