reorganize web app with nested states
fix bugs
rename welcome state to user
more bug fixes
Merge pull request #202 from dskae/master

reorganize web app with nested states