Migration to bootstrap 3 for different html templates
Merge remote-tracking branch 'origin/develop' into develop