added framerate marking
Don't drop the bass anymore
Don't drop the bass anymore try 2
Merge branch 'master' of https://github.com/mannol1/ProjectTox-Core

Conflicts:
	toxmsi/phone.c