* Removed "default" account type
Merge remote-tracking branch 'upstream/master'