Merge pull request #232 from bhariharan/unstable20

Merge branch 'unstable' into unstable20
Make layouts fully customizable by using dimensions
Merge pull request #234 from bhariharan/customize_passcode

Make layouts fully customizable by using dimensions
Merge branch 'master' into unstable
Merge pull request #235 from bhariharan/unstable

Merge branch 'master' into unstable
Merge branch 'unstable' into unstable20