Interface upgrave IV.2
Merge branch 'master' of https://github.com/A-StadLabs/fact-r

Conflicts:
	app/elements/asl-factor/asl-factor.html
Merge branch 'master' of https://github.com/A-StadLabs/fact-r