fixed tooltip on apptype
fixed conflict
fixed security bug
Merge branch 'authenticate' into herokuprod