Merge pull request #675 from zzottel/master

don't overwrite $x (contains import_xchan result) with role permissions
Provide a way to mark photos as adult and hide them from the default album view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional.
visible flag reversed
fix nbsp tag typoes in french translation
Merge pull request #676 from magicoli/master

fix nbsp tag typoes in french translation
include self in load_contact_links so you don't get a connect menu entry for yourself
provide lockstate for photo edit
doc updates
rev update
fix broken photo edits when adult flag is changed
Merge https://github.com/friendica/red into pending_merge
revert that bit
tgroup_check - decrypt if obscured before checking body text for reshares