merging
Merge remote-tracking branch 'upstream/release-1' into release-1
merging to get submissions view
adding devise views
resolving merge conflicts
merging
merge with talal
Merge pull request #15 from JParker85/release-1

Stylings