Fixed loading of bootstrap Javascript
Added link to github issues
Merged changes from master