I actually wasn't able to fix the problem, the ringtone that I put in the application data/sound folder was only available for my missed calls notification, not my incoming phone calls, so I'm guessing no one knows what to do?
I just downgraded back to 6.0 and I have no problems, I guess 6.1 has some problems.
Thanks anyways guys.