Merge remote-tracking branch 'upstream/pull/2109'

diff --cc app/abilities/ability.rb
index dcaa7e347a572f7040fdea42105f87255da96106,7138374f376692c37f26644c9b9bfe5731731210..09e9be2cf2c7a92cb3b4afd64ceafa045487dff5
--- 1/app/abilities/ability.rb
--- 2/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@@ -23,10 -16,11 +23,12 @@@ class Abilit
  
      if user
        can :welcome, :site
+       can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
        can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
+       can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
        can [:close, :reopen], Note
        can [:new, :create], Report
 +      can [:mine, :new, :create, :edit, :update, :delete, :api_create, :api_read, :api_update, :api_delete, :api_data], Trace
        can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User
        can [:read, :read_one, :update, :update_one, :delete_one], UserPreference