Merge branch 'master', remote-tracking branch 'origin'
start adding localStorage support
use localStorage and do not worry about the database