Rewrote javascript files to use requirejs. Fixed bootstrap fonts. Added angular and angular templates.
gerge remote-tracking branch 'upstream/master'