Implements #1053
Fix library test issue
Working on #1053
Boostrap becomes the default template
Merge pull request #1059 from emmanuel-keller/master

Bug fixes and improvement