Merge remote-tracking branch 'origin/master' into ExportCharacter
reorganized js files a bit
completing the move
Merge remote-tracking branch 'origin/ExportCharacter'