Merge pull request #899 from oliverds/master

Some Fixes
authorize
Sure you want to leave? modal jscript #506
Merge remote-tracking branch 'upstream/master'