Fix upper case in variable name.
Use correct qml type.
Fix conflicts.
Merge pull request #2 from ruedigergad/master

Fix enum type in account selector