Merge pull request #296 from ryanguill/develop

https://github.com/framework-one/fw1/issues/287
https://github.com/framework-one/fw1/issues/285
Added disableLayout() and enableLayout() with tests.