updated referenced javafx jr to 1.7.21
Merge branch 'master' into local-files
initial changes to generalize ingest to input Content not just Image