modified .gitignore; added *.pyc, *.swp, *.json
removed *.pyc files from repository
Merge branch 'dev' into app/annote
Merge branch 'app/annote' into exp/block-select
remove demodb.json
Merge branch 'dev' into app/annote
Merge branch 'app/annote' into exp/block-select