Merge branch 'master' into delegation

app/assets/javascripts/ajaxUpload/view.js

app/controllers/common/posts.rb

app/controllers/groups/directory_controller.rb

app/controllers/groups/home_controller.rb

app/controllers/groups/profiles_controller.rb

app/controllers/groups/wikis_controller.rb

app/controllers/me/posts_controller.rb

app/controllers/me/profile_controller.rb

app/controllers/pages/assets_controller.rb

app/controllers/pages/base_controller.rb

app/controllers/pages/posts_controller.rb

app/controllers/pages/trash_controller.rb

app/controllers/people/directory_controller.rb

app/controllers/wikis/wikis_controller.rb

app/helpers/common/page/post_helper.rb

app/helpers/common/ui/avatar_helper.rb

app/helpers/common/ui/post_helper.rb

app/helpers/common/utility/general_helper.rb

app/helpers/groups/links_helper.rb

app/helpers/groups/settings_helper.rb