Adding all new and modified pages
committing the user index page
Merge branch 'master' of https://github.com/mbeck7/AgileClassProject

Conflicts:
	config/routes.rb
	solr/default/data/index/segments.gen
	solr/development/data/index/segments.gen
	solr/pids/development/sunspot-solr-development.pid