Merge pull request #1856 from MPOS/development

Dev to Master
[FIX] Bail findblocks on block insertion errors

Fixes #1857 once merged.
Merge pull request #1858 from MPOS/findblock-bailout

[FIX] Bail findblocks on block insertion errors
[UPDATE] site specific files
Fixed table cells for general_stats.tpl

<th></td> is obviously wrong
Merge pull request #1863 from Contex/master

Fixed table cells for general_stats.tpl
Merge branch 'master' into development
Merge branch 'master' into bootstrap