added labels and values for App Categories and App Types
added labels and values for App Categories and App Types
Merge remote-tracking branch 'origin/dev' into dev