Densidad del medio
Merge branch 'master' of https://github.com/imp14a/lab_fisica

Conflicts:
	App/js/general_functions.js
	Service/pages/control/SimulatorController.php