Merge branch 'gh-pages' of https://github.com/SMU-SIS/kinnovators int…

…o gh-pages

Conflicts:
	app.yaml
	app/console.html
	app/groups.html
	app/index.html
	app/js/angular/console-controller.js
	app/js/angular/groups-controller.js
	app/js/angular/index-controller.js
	app/js/angular/profile-controller.js
	app/js/angular/search-controller.js
	app/js/angular/sketch-controller.js
	app/js/angular/view-controller.js
	app/profile.html
	app/search.html
	app/sketch.html
	app/view.html
	backend.pyc
	rpx.py
	rpx.pyc

app.yaml

@@ -1,5 +1,5 @@
 application: ksketchweb
-version: 13
+version: 14
 runtime: python27
 api_version: 1
 threadsafe: false
@@ -8,11 +8,12 @@ builtins:
 #- deferred: on
 
 handlers:
+# Uncomment and use this handler for batch updates of entities when necessary
 #- url: /update_schema
 #  script: update_schema_handler.app  # path to webapp2 application definition.
 #  login: admin
-#  secure: always  
-  
+#  secure: always
+
 - url: /
   static_files: index.html
   upload: index.html
@@ -33,7 +34,7 @@ handlers:
   script: rpx.application
 
 - url: /.*
-  script: backend.application
+  script: handler.application
 
 libraries:
 - name: webapp2