Merge branch 'master' into tutorial

Conflicts:
	config.py
	static/js/app.js
	test/data/test.db

application.py

@@ -1,5 +1,4 @@
 import logging
-import os
 
 from app import app as application
 from data.model import db as model_db
@@ -21,10 +20,6 @@ from endpoints.realtime import realtime
 
 logger = logging.getLogger(__name__)
 
-if application.config.get('INCLUDE_TEST_ENDPOINTS', False):
-  logger.debug('Loading test endpoints.')
-  import endpoints.test
-
 application.register_blueprint(web)
 application.register_blueprint(index, url_prefix='/v1')
 application.register_blueprint(tags, url_prefix='/v1')