Added model test for assests
Merge branch 'master' of git://github.com/clocklimited/Catfish
Merge branch 'master' of git://github.com/clocklimited/Catfish
Rename of editView in layout
Merge branch 'master' of git://github.com/clocklimited/Catfish