Merge branch 'dev' into feature/Roderick-Student-UI
implement basic deck edit/delete
add tests
fix urls on collection view for deck instructor actions
changing url name to better fit our conventions
Merge pull request #30 from Harvard-ATG/feature/deck-buttons

Feature/deck buttons
Merge pull request #31 from Harvard-ATG/feature/fix-collection-index-url

Feature/fix-collection-index-url
Fixed the buttons for small screen devices when inside a deck
merged dev into branch and resolved conflicts in styles.css and deck_view.html
Merge pull request #32 from Harvard-ATG/feature/Roderick-Student-UI

Feature/roderick student ui
fix mobile slider buttons -- javascript was wrong
cleanup the template structure and normalize the blocks
working on card form
show the correct fields in the card form based on the card template
make upload file optional for adding a new deck
fix cancel button and add identifier to card fields
implemented the front/back end of the card form and fixed some issues with the deck display
fix tests
removing local jquery.form plugin - use cdn for now
move api dir