Merge branch 'master' of https://github.com/phmasz/Todohub
views reorganization & etc...