Merge pull request #366 from beardy-unixer/master

Stick help in a template
fix colors on input elements which bootstrap set to "inherit" and doesn't play nicely with dark themes.
Merge https://github.com/friendica/red into zpull
json_return_and_dir is a typo
json_return_and_dir isn't a thing
move region_1 to off instead of removing it and dont squelch region_2 when region_1 moves in again
Merge branch 'master' of https://github.com/friendica/red
remove allowed friend domains and allowed email domains from admin settings - as they are not implemented
Merge https://github.com/friendica/red into zpull
contact_block() not being shown to unauthenticated visitors - even if perms allow. Also separate the permissions logic for this function so that we can have a mini-profile widget and a separate contact_block widget instead of always lumping them together. We probably also should move contact_block() outside of include/text.php as it doesn't really belong there. Just not sure where it belongs - perhaps contact_widgets wouold be a good place.
API: statusnet_html:trim was trimming too much
merge
Merge pull request #367 from cvogeley/master

API: statusnet_html:trim was trimming too much
doc update
Merge https://github.com/friendica/red into zpull
this is the correct fix
little fixes of hopefully nil significance
mail notification goes to old link
remove mysql dependencies from cache api
sprintf error