target ruby 2.1
Merge remote-tracking branch 'origin/master'

# By Brian R Zaik
# Via Brian R Zaik
* origin/master:
  Updated screens#index and groups#index to match submissions#index headers