alphabetize looks better...
Merge branch 'master' of github.com:CS169-badjr/calapps

Conflicts:
	app/models/calapp.rb
	solr/development/data/index/segments.gen