1. complete ShopModal CSS
2. complete ShopModalView structure
Merge branch 'W17F-1' into W17F
Merge branch 'W17D' into W17
Merge branch 'W17a' into W17
Merge branch 'W17F' into W17
temp commit
temp commit
Merge branch 'develop' into W17E

Conflicts:
	djangotest/templates/index.html
Merge branch 'local_develop' into W17E
Merge branch 'W17E' into local_develop
1. fix sorting problem
2. fix button for opening EditShopModal
1. add all backbone variables under "var app"
1. separate backbone models, collections, views to different folders
1. change file structure
1. change file structure
1. change file structure
1. arrange index.html
1. delete collection folder