added QTc formula drop-down much like Apple version, changed default QTc to be a default in settings
updated local develop from github, to be pushed back up
fixed merge conflict in strings.xml