Work on #1035
Implements #1016
Implements #1053
Fix library test issue
Working on #1053
Boostrap becomes the default template
Merge pull request #1049 from emmanuel-keller/1.6

Bug fixes and improvement