#15647072122014 wrong category in subjects.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/public/html/disciplines.html