Merge pull request #231 from bhariharan/unstable

Merge branch 'master' into unstable
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