Merge pull request #359 from ruijunhuang2010/master

Merge pull request #1 from ChrisBoesch/master
Rolling back ui-bootstrap add untile after the ViTech final and there is more time to update and test all libraries.
Merge pull request #2 from ChrisBoesch/master

update