Update for JSON file generation.
Fixes on FTP configuration-tool and config itself
JSON as mime-type application/json now and not "stream" anymore

Merge branch 'development'
Punch to alpha8

* Merge branch 'development'
* repairs broken timesave functionality
* copy over content instead of moving stuff around
Changes for enabling working IPv6 configuration and Mesh-Node configs
Changes first in development for further packaging
Revert "Changes for enabling working IPv6 configuration and Mesh-Node configs"

This reverts commit b8d63826676096cdab3b5bf66f6a26d64adfcbc0.
LibraryBox 2.0 alpha8
Merge branch 'development'
version fix up to 2.0.0_alpha9
LibraryBox 1.0.0 beta1 release
Merge branch 'development'

Conflicts:
	Makefile
add support for documented top mode
tidying comments
first pass at top downloads script
Merge pull request #2 from thatandromeda/display_counters

Display counters
LibraryBox 2.0.0 beta 2 release
Merge branch 'development'
Version Tag vor beta2
slight fixes to Shoutbox code. Top 10 on front page working, but still need to style it
Small URL fix on About link
Squashed 'LibraryBox-landingpage/' changes from f2360f5..e06951c

e06951c Bootstrap overwork Merge branch 'development'
c6a777b Merge remote-tracking branch 'origin/jg-dev' into development
3b97555 Merge remote-tracking branch 'origin/jb-dev' into development
21c8bc2 Reworked the CSS and HTML to be fully bootstrap able
3fee0e3 Merge commit '23202a91d31e0734314bdb075ce43abb06445c4b' into development
0d3103b Merge pull request #2 from thatandromeda/display_counters

git-subtree-dir: LibraryBox-landingpage
git-subtree-split: e06951ca69b13b67a5cc5e0d4a3e736d84522588
OverWork with Bootstrap
Merge commit '92c921a37c6ce40a1ed6682d7576434499b3e6e7' into development
Merge remote-tracking branch 'origin/jb-dev' into development

Conflicts:
	LibraryBox-landingpage/www_content/about.html
	LibraryBox-landingpage/www_content/index.html