shuffle renumbering done
shuffling was causing weird margins; fixed that
fixed renumbering
fixed renumbering
Merge pull request #89 from Harvard-ATG/feature/shuffle-renumbering

Feature/shuffle renumbering
Modified the "Language with audio" template so audio is clearly labeled on the front of the card. Removed unused templates.
Merge pull request #91 from Harvard-ATG/feature/template-changes

feature/template-changes
Updated placeholder text for audio fields.
Merge branch 'dev' of github.com:Harvard-ATG/HarvardCards into dev
Fixed IOError when uploading spreadhseet with empty image fields
Only retrieve the ID field that we need.
Reduced the total number of DB queries the app was making on the deck index.
revert urls
revert dev settings
Merge pull request #92 from Harvard-ATG/feature/perftweaks

Feature/perftweaks
update admin user list view
Merge branch 'bchau_branch' into dev