Merge remote-tracking branch 'upstream/master'
doc update
add BBCode reference
update 'Creating posts', change screenshot (use duepuntozero theme)
update 'Install', add point on create view/smarty3 folder
update 'Plugins', add section on templates
fix reading sitename config
bug #540 and hush up a couple of log messages that are way too verbose
Merge https://github.com/friendica/friendica into pull
ZH-CN: update to the strings
system support for complete blocking
Merge https://github.com/friendica/friendica into pull
Merge pull request #670 from fabrixxm/help

doc update
pgettext needs dba.php for q()
Merge pull request #673 from cpfeiffer/pgettext_missing_dba

pgettext needs dba.php for q()
Merge pull request #672 from cpfeiffer/email-notification-sitename-fix

fix reading sitename config
undefined element
Merge https://github.com/friendica/friendica into pull
optimise cachefile logic - still not sure why the cachefile profiling was getting triggered on a site with no cachefile configured
bad checkin
spelling
basic video playback support using VideoJS
add some styling for the video player
	modified:   view/theme/smoothly/default.php
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php