Merging recent changes from internal mockup branch
Update of dependencies to latest versions (bootstrap, jquery, angularjs)