fix api message thread
Merge branch 'template_refactoring'
fix daily hops api
sign out link
fix api content-types
fix api content-type part 2
apdate video
fix friend invite notifications
fix api content type part 3
synchronize messages refactoring
Merge branch 'update_video'
fix wrong user name in social networks login
add page 3 and 4
really send email in admin email_tool
add logo
add courusel
api content-type refactoring
resolve conflicts
Merge branch 'logo_task'
resolve merge conflicts