add --imports option
fix default value for imports to None
typo fix
Merge remote-tracking branch 'upstream/master'
change to use JSON file with app definitions
fix merge problem
remove unneeded import sys
another merge fix
fix merge conflict with upstream