merge
client side rendering welcome page
Merge branch 'develop' of github.com:ulmic/nastachku into develop
Merge branch 'develop', remote-tracking branch 'origin' into develop