Merge branch 'master' into 'adminLTE3-corrections'

# Conflicts:
#   hiboo/account/templates/account_profiles.html
#   hiboo/application/templates/application_synapse/room.html
#   hiboo/application/templates/application_synapse/rooms.html
#   hiboo/application/templates/application_synapse/user.html
#   hiboo/profile/templates/profile_action.html
#   hiboo/profile/templates/profile_details.html
#   hiboo/profile/templates/profile_list.html
#   hiboo/profile/templates/profile_pick.html
#   hiboo/profile/templates/profile_quick.html
#   hiboo/service/templates/service_action.html
#   hiboo/service/templates/service_details.html
#   hiboo/service/templates/service_list.html
#   hiboo/templates/base.html
#   hiboo/user/templates/user_details.html
#   hiboo/user/templates/user_list.html
#   hiboo/user/templates/user_pick.html