jquery from localhost
Merge remote-tracking branch 'origin/master'
file manager, attachments, etc