Merge branch 'develop'

config.json

@@ -1,6 +1,6 @@
 {
  "base_template": "lib/website/templates/base.html", 
- "framework_version": "3.3.0", 
+ "framework_version": "3.3.1", 
  "modules": {
   "Calendar": {
    "color": "#2980b9", 

webnotes/modules/__init__.py

@@ -7,6 +7,7 @@ from __future__ import unicode_literals
 """
 import webnotes, os
 from webnotes import conf
+import webnotes.utils
 
 lower_case_files_for = ['DocType', 'Page', 'Report', 
 	"Workflow", 'Module Def', 'Desktop Item', 'Workflow State', 'Workflow Action']