connect admin scripts, fix modal callbacks, convert button events to jquery from bootstrapjs
Merge remote-tracking branch 'master/master'