Merge pull request #3 from ChrisBoesch/master

update
resolve pop up modal and Carousel not working  issue
minor amend
Merge pull request #5 from ruijunhuang2010/master

update