diff --git a/app/assets/images/module/thumb/mt1.jpg b/app/assets/images/module/thumb/mt1.jpg
new file mode 100644
index 000000000..bab6ab799
Binary files /dev/null and b/app/assets/images/module/thumb/mt1.jpg differ
diff --git a/app/assets/images/module/thumb/mt10.jpg b/app/assets/images/module/thumb/mt10.jpg
new file mode 100644
index 000000000..404f99f8a
Binary files /dev/null and b/app/assets/images/module/thumb/mt10.jpg differ
diff --git a/app/assets/images/module/thumb/mt11.jpg b/app/assets/images/module/thumb/mt11.jpg
new file mode 100644
index 000000000..81dc5f87f
Binary files /dev/null and b/app/assets/images/module/thumb/mt11.jpg differ
diff --git a/app/assets/images/module/thumb/mt12.jpg b/app/assets/images/module/thumb/mt12.jpg
new file mode 100644
index 000000000..80d6a849c
Binary files /dev/null and b/app/assets/images/module/thumb/mt12.jpg differ
diff --git a/app/assets/images/module/thumb/mt2.jpg b/app/assets/images/module/thumb/mt2.jpg
new file mode 100644
index 000000000..8fb3daa99
Binary files /dev/null and b/app/assets/images/module/thumb/mt2.jpg differ
diff --git a/app/assets/images/module/thumb/mt3.jpg b/app/assets/images/module/thumb/mt3.jpg
new file mode 100644
index 000000000..1fbaeabf1
Binary files /dev/null and b/app/assets/images/module/thumb/mt3.jpg differ
diff --git a/app/assets/images/module/thumb/mt4.jpg b/app/assets/images/module/thumb/mt4.jpg
new file mode 100644
index 000000000..8bdc55667
Binary files /dev/null and b/app/assets/images/module/thumb/mt4.jpg differ
diff --git a/app/assets/images/module/thumb/mt5.jpg b/app/assets/images/module/thumb/mt5.jpg
new file mode 100644
index 000000000..30b009f5a
Binary files /dev/null and b/app/assets/images/module/thumb/mt5.jpg differ
diff --git a/app/assets/images/module/thumb/mt6.jpg b/app/assets/images/module/thumb/mt6.jpg
new file mode 100644
index 000000000..3ae48ef19
Binary files /dev/null and b/app/assets/images/module/thumb/mt6.jpg differ
diff --git a/app/assets/images/module/thumb/mt7.jpg b/app/assets/images/module/thumb/mt7.jpg
new file mode 100644
index 000000000..f6ea651b0
Binary files /dev/null and b/app/assets/images/module/thumb/mt7.jpg differ
diff --git a/app/assets/images/module/thumb/mt8.jpg b/app/assets/images/module/thumb/mt8.jpg
new file mode 100644
index 000000000..fa450b3c7
Binary files /dev/null and b/app/assets/images/module/thumb/mt8.jpg differ
diff --git a/app/assets/images/module/thumb/mt9.jpg b/app/assets/images/module/thumb/mt9.jpg
new file mode 100644
index 000000000..b1fc605bb
Binary files /dev/null and b/app/assets/images/module/thumb/mt9.jpg differ
diff --git a/app/assets/images/modulestore/app-icon.jpg b/app/assets/images/modulestore/app-icon.jpg
deleted file mode 100644
index 711f04811..000000000
Binary files a/app/assets/images/modulestore/app-icon.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/app.jpg b/app/assets/images/modulestore/app.jpg
deleted file mode 100644
index 667958825..000000000
Binary files a/app/assets/images/modulestore/app.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/carousel_feature.png b/app/assets/images/modulestore/carousel_feature.png
deleted file mode 100644
index ee38685fb..000000000
Binary files a/app/assets/images/modulestore/carousel_feature.png and /dev/null differ
diff --git a/app/assets/images/modulestore/deault-app-icon.jpg b/app/assets/images/modulestore/deault-app-icon.jpg
deleted file mode 100644
index 3bbc5a677..000000000
Binary files a/app/assets/images/modulestore/deault-app-icon.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/dropbox.jpg b/app/assets/images/modulestore/dropbox.jpg
deleted file mode 100644
index e48bf90f6..000000000
Binary files a/app/assets/images/modulestore/dropbox.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/h1_bg.png b/app/assets/images/modulestore/h1_bg.png
deleted file mode 100644
index c413594c6..000000000
Binary files a/app/assets/images/modulestore/h1_bg.png and /dev/null differ
diff --git a/app/assets/images/modulestore/left_nav.png b/app/assets/images/modulestore/left_nav.png
deleted file mode 100644
index e312ed92a..000000000
Binary files a/app/assets/images/modulestore/left_nav.png and /dev/null differ
diff --git a/app/assets/images/modulestore/right_nav.png b/app/assets/images/modulestore/right_nav.png
deleted file mode 100644
index df81ea5dc..000000000
Binary files a/app/assets/images/modulestore/right_nav.png and /dev/null differ
diff --git a/app/assets/images/modulestore/screen-capture.jpg b/app/assets/images/modulestore/screen-capture.jpg
deleted file mode 100644
index 52475c046..000000000
Binary files a/app/assets/images/modulestore/screen-capture.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/screenshot1.jpg b/app/assets/images/modulestore/screenshot1.jpg
deleted file mode 100644
index fc562e958..000000000
Binary files a/app/assets/images/modulestore/screenshot1.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/screenshot2.jpg b/app/assets/images/modulestore/screenshot2.jpg
deleted file mode 100644
index c98375830..000000000
Binary files a/app/assets/images/modulestore/screenshot2.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/screenshot3.jpg b/app/assets/images/modulestore/screenshot3.jpg
deleted file mode 100644
index b0a9c6426..000000000
Binary files a/app/assets/images/modulestore/screenshot3.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/screenshot4.jpg b/app/assets/images/modulestore/screenshot4.jpg
deleted file mode 100644
index fd11b7776..000000000
Binary files a/app/assets/images/modulestore/screenshot4.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/screenshot5.jpg b/app/assets/images/modulestore/screenshot5.jpg
deleted file mode 100644
index 5231eedae..000000000
Binary files a/app/assets/images/modulestore/screenshot5.jpg and /dev/null differ
diff --git a/app/assets/images/modulestore/slide01.jpg b/app/assets/images/modulestore/slide01.jpg
deleted file mode 100644
index eb9f8eb9f..000000000
Binary files a/app/assets/images/modulestore/slide01.jpg and /dev/null differ
diff --git a/app/assets/images/template/thumb/tb1.jpg b/app/assets/images/template/thumb/tb1.jpg
new file mode 100644
index 000000000..3b42d6b6e
Binary files /dev/null and b/app/assets/images/template/thumb/tb1.jpg differ
diff --git a/app/assets/images/template/thumb/tb10.jpg b/app/assets/images/template/thumb/tb10.jpg
new file mode 100644
index 000000000..e33b989fe
Binary files /dev/null and b/app/assets/images/template/thumb/tb10.jpg differ
diff --git a/app/assets/images/template/thumb/tb11.jpg b/app/assets/images/template/thumb/tb11.jpg
new file mode 100644
index 000000000..4cf624a06
Binary files /dev/null and b/app/assets/images/template/thumb/tb11.jpg differ
diff --git a/app/assets/images/template/thumb/tb12.jpg b/app/assets/images/template/thumb/tb12.jpg
new file mode 100644
index 000000000..6e5ebb666
Binary files /dev/null and b/app/assets/images/template/thumb/tb12.jpg differ
diff --git a/app/assets/images/template/thumb/tb2.jpg b/app/assets/images/template/thumb/tb2.jpg
new file mode 100644
index 000000000..543b45d93
Binary files /dev/null and b/app/assets/images/template/thumb/tb2.jpg differ
diff --git a/app/assets/images/template/thumb/tb3.jpg b/app/assets/images/template/thumb/tb3.jpg
new file mode 100644
index 000000000..2ec440d88
Binary files /dev/null and b/app/assets/images/template/thumb/tb3.jpg differ
diff --git a/app/assets/images/template/thumb/tb4.jpg b/app/assets/images/template/thumb/tb4.jpg
new file mode 100644
index 000000000..91da70c54
Binary files /dev/null and b/app/assets/images/template/thumb/tb4.jpg differ
diff --git a/app/assets/images/template/thumb/tb5.jpg b/app/assets/images/template/thumb/tb5.jpg
new file mode 100644
index 000000000..8ec85d0a9
Binary files /dev/null and b/app/assets/images/template/thumb/tb5.jpg differ
diff --git a/app/assets/images/template/thumb/tb6.jpg b/app/assets/images/template/thumb/tb6.jpg
new file mode 100644
index 000000000..22850b378
Binary files /dev/null and b/app/assets/images/template/thumb/tb6.jpg differ
diff --git a/app/assets/images/template/thumb/tb7.jpg b/app/assets/images/template/thumb/tb7.jpg
new file mode 100644
index 000000000..15dfad019
Binary files /dev/null and b/app/assets/images/template/thumb/tb7.jpg differ
diff --git a/app/assets/images/template/thumb/tb8.jpg b/app/assets/images/template/thumb/tb8.jpg
new file mode 100644
index 000000000..150a25011
Binary files /dev/null and b/app/assets/images/template/thumb/tb8.jpg differ
diff --git a/app/assets/images/template/thumb/tb9.jpg b/app/assets/images/template/thumb/tb9.jpg
new file mode 100644
index 000000000..5cce5089f
Binary files /dev/null and b/app/assets/images/template/thumb/tb9.jpg differ
diff --git a/app/assets/images/templatestore/h1_bg.png b/app/assets/images/templatestore/h1_bg.png
deleted file mode 100644
index b8f1f01ba..000000000
Binary files a/app/assets/images/templatestore/h1_bg.png and /dev/null differ
diff --git a/app/assets/images/templatestore/screenshot1.jpg b/app/assets/images/templatestore/screenshot1.jpg
deleted file mode 100644
index fc562e958..000000000
Binary files a/app/assets/images/templatestore/screenshot1.jpg and /dev/null differ
diff --git a/app/assets/images/templatestore/screenshot2.jpg b/app/assets/images/templatestore/screenshot2.jpg
deleted file mode 100644
index c98375830..000000000
Binary files a/app/assets/images/templatestore/screenshot2.jpg and /dev/null differ
diff --git a/app/assets/images/templatestore/screenshot3.jpg b/app/assets/images/templatestore/screenshot3.jpg
deleted file mode 100644
index b0a9c6426..000000000
Binary files a/app/assets/images/templatestore/screenshot3.jpg and /dev/null differ
diff --git a/app/assets/images/templatestore/screenshot4.jpg b/app/assets/images/templatestore/screenshot4.jpg
deleted file mode 100644
index fd11b7776..000000000
Binary files a/app/assets/images/templatestore/screenshot4.jpg and /dev/null differ
diff --git a/app/assets/images/templatestore/screenshot5.jpg b/app/assets/images/templatestore/screenshot5.jpg
deleted file mode 100644
index 5231eedae..000000000
Binary files a/app/assets/images/templatestore/screenshot5.jpg and /dev/null differ
diff --git a/app/assets/images/templatestore/template-icon.jpg b/app/assets/images/templatestore/template-icon.jpg
deleted file mode 100644
index 7dca3b023..000000000
Binary files a/app/assets/images/templatestore/template-icon.jpg and /dev/null differ
diff --git a/app/assets/images/templatestore/template.jpg b/app/assets/images/templatestore/template.jpg
deleted file mode 100644
index 76fb1064e..000000000
Binary files a/app/assets/images/templatestore/template.jpg and /dev/null differ
diff --git a/app/controllers/admin/template_store_controller.rb b/app/controllers/admin/template_store_controller.rb
index 16e8fc056..a8656d82a 100644
--- a/app/controllers/admin/template_store_controller.rb
+++ b/app/controllers/admin/template_store_controller.rb
@@ -7,7 +7,7 @@ class Admin::TemplateStoreController < ApplicationController
end
def show
- @template = JSON.parse(get_template(params[:id]))
+ @template = JSON.parse(get_template(params[:id])) rescue nil
end
protected
diff --git a/app/views/admin/module_store/index.html.erb b/app/views/admin/module_store/index.html.erb
index 46db0aa2a..fe733a850 100644
--- a/app/views/admin/module_store/index.html.erb
+++ b/app/views/admin/module_store/index.html.erb
@@ -78,19 +78,10 @@
diff --git a/app/views/admin/template_store/show.html.erb b/app/views/admin/template_store/show.html.erb
index 4df566cbb..1f895614f 100644
--- a/app/views/admin/template_store/show.html.erb
+++ b/app/views/admin/template_store/show.html.erb
@@ -52,7 +52,7 @@