FRI updates, general styles, mdetect rewrite
fixed conflict

Conflicts:
	CNS_3/css/style.css