Major changes, fixed angular + requirejs integration