bootstrap-3.3.1 and minor css fixes
Merge pull request #715 from f03el/master

Update Swedish strings
update nl
update nl (typo)
readd link_colour again
Merge branch 'master' of https://github.com/friendica/red
Fix abook_toggle_flag from postgres stuff
Merge branch 'master' of https://github.com/friendica/red
Whitespace.  Stupid £#@£@$ editor.
Handle included txt files (ie, install doco) as BBCode, otherwise it strips all
white space.  Was going to use Markdown, but lots of not-markdown gets parsed
then, so...
The other half of 'any theme for any device'.  Closes #71
Italian translation
Merge pull request #718 from tuscanhobbit/dev

Italian translation
Somewhat subtle process_delivery() bug - $public was not being reset if a sys
channel is reached but then the loop iterated over another channel.
Don't allow affinity of 0 in connedit.
rev update
Merge https://github.com/friendica/red into pending_merge

Conflicts:
	version.inc
can't reset public to false because it may have been passed in as true and this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
add comodo intermediate certs and a method to add other intermediate certs.
Merge pull request #1 from friendica/master

Merge master from friendica