#17 Admin home student list added.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/views/users/show.html.erb