Merge pull request #217 from bhariharan/unstable20

Merge 'unstable' into unstable20
Make app display name substitutable
Merge pull request #219 from bhariharan/passcode_strings

Make app display name substitutable
Merge branch 'unstable' into unstable20