MP3 quality option added
Merge remote-tracking branch 'origin/master' into daveiga

Conflicts:
	src/com/ibm/fr/convertor/App.java
bug correction