AngularJS version 1.2.3
Merge branch 'angularjs' into development
Added Bootstrap version 3.0.2
Merge branch 'bootstrap' into development