second fix serie
Merge branch 'master' of https://github.com/khcr/resj

Conflicts:
	app/views/subjects/index.html.erb