Fdc

Merged in upstream changes
Replaced CustomViewAbove with upstream version
Added output files to .gitignore