fixed bug with file cancel, fixed bug with multiple canvases being generated
added IOS fix for stretching and rotation
added icons, added tanktop to seed file
Merge branch 'master' into deaf_grandma_changes
Merge pull request #29 from CandidKilsborne/deaf_grandma_changes

Deaf grandma changes
modified?
Merge branch 'master' into add-item-refine
fixed finding canvas on every page
Merge pull request #30 from CandidKilsborne/add-item-refine

Add item refine
cleaned up goelocation js, moved to separate file
moved model js files to models folder in assets/javascripts
Merge pull request #31 from CandidKilsborne/fix-geolocation-js

Fix geolocation js
adjusted code to reflect influx of icons
Merge pull request #32 from CandidKilsborne/category-icons

adjusted code to reflect influx of icons
deaf grandma messages updated
Merge branch 'master' into deaf_grandma_changes_4_real
Merge pull request #33 from CandidKilsborne/deaf_grandma_changes_4_real

Messages Updated
sorted articles by category name
Merge branch 'master' into sort-article-views
Merge pull request #34 from CandidKilsborne/sort-article-views

Sort article views