Progress indicator in ACS plugin.
Added some constants for AppId plugin.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into dev