Merge remote-tracking branch 'upstream/master'
Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself
Remove debug line added by mistake
Merge pull request #657 from mexon/cron_lock

Add separate lock file for cronhooks, which might also take a long time ...
Merge pull request #656 from fabrixxm/master

phpdocs for include/text.php
DE: update to the strings
vier: The background color of the right area is now white.
Merge remote-tracking branch 'upstream/master'
Merge pull request #658 from annando/master

Mail importing problems, a small "vier" change
Make the content type available after calling fetch_url
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
Merge pull request #659 from mexon/fetch_url_content_type

Make the content type available after calling fetch_url
uimport: check table columns before import
uimport: fix file formatting
PL: update to the strings
rev update
Merge https://github.com/friendica/friendica into pull
Merge pull request #660 from fabrixxm/moveme

uimport: check table columns before import