Added support for defining layout in view files as well.
Merge remote-tracking branch 'origin/master'