Add new bootstrap - 0.7
Merge remote-tracking branch 'origin/dev' into dev