Merge branch 'bootstraping'
Merge branch 'master' of https://github.com/ok-devalias/gae-timesheet