First step add convert menu
Second step add convert menu
Merge branch 'master' of https://github.com/shilleroleg/calc

Conflicts:
	calc/src/ru/olega/calc/MyDialogConvert.java