merged submissions package into catalog
updated catalog file structure
merged base into catalog
setup catalog views directory
fixed static include reference
Need to merge config again
Merge remote-tracking branch 'origin/configuration' into i18n