upadted layout back to two rows
improvements to block store
Merge branch 'develop' of ssh://github.com/bitcoin-solutions/multibit-hd into develop
more blockstore refactoring
NPE protection
Merge branch 'develop' of ssh://github.com/bitcoin-solutions/multibit-hd into develop