Resolved conflicts.
Removed unused files
Reorganized app code and added TODOs
Formatted/standardized code
Added template and HTML for displaying and adding file groups.
Added file group and list views.
Formatting