Merge pull request #53 from jstrimpel/master

fixed client layout navigate clean up
fixed broken ref to isClient prop when initing app on server