Bumped angular version
Fixed race condition with bookmarks/media/userprofile

Also Fixed checked in conflicts