fixes
Merge branch 'master' of https://github.com/daboe01/CPTextView

Conflicts:
	CPTextView/Frameworks/TextView/CPFontPanel.j