Merged with ui. Added .orig files to .gitignore.