I'm so..I don't know..I don't think there is an emotion for it..

Some people cannot comprehend that forgiveness is the best weapon against those who do them wrong. Someone once said that to be kind to your enemy is like pouring hot coals on their head. So rather than being anrgy, take her apology and willfulness to correct her wrong and attempt to salvage your once good friendship in stride. Talk to her and see how things go. There is a possability that she has changed since she "ditched" you. You'll never know unless you talk to her. Just keep this in mind: "Sometimes the most regretful moments are the ones that never happened"
As for your boyfriend, I would suggest talking to him as well. He may have snapped at you because he may have other things going on in his life that have him stressed out and [likely] unintentionally lashed out at you. Give him a day or so and then talk to him to see how he's doing, or send him a "Thinking of You" e-card. That's always sweet and can [sometimes] fix the biggest problems [like duct tape]
Good luck and I hope everything works out okay.

XxS*AngelxX