Merge branch 'master' into dev_export

.gitignore

 *~
 .project
+*.pyc
 .pydevproject
 .settings/
 cache/

buildVersion.py

@@ -369,7 +369,7 @@ if __name__ == '__main__':
     ops.add_option("-c", "--compile",
                    action="store_true",
                    dest="compile",
-                   help="compile the minimal library using sencha command.")
+                   help="compile the javascript library using sencha command.")
     
     ops.add_option("-e", "--epydoc",
                    action="store_true",

modules/plugin_dbui/converter.py

@@ -17,7 +17,6 @@ from helper import (encode_field,
                     is_foreign_field,
                     is_set_field)
 from mapper import map_default
-from docutils.nodes import row
 
 # Associated gluon.dal.field type with an ExtJS widget
 # The dictionary contains configuration parameters of the Ext JS widget