Updated Angular version to 1.2.6.
Updated Bootstrap to version 3.0.3.
Merge branch 'master' into gh-pages