Merge branch 'master' of
https://github.com/javiergarciasanchez/PHX_2.git

Conflicts:
	PHX_2/PHX_2.rs/parameters.xml
	PHX_2/src/pHX_2/Firm.java
Merge branch 'master' of https://github.com/javiergarciasanchez/PHX_2

Conflicts:
	PHX_2/PHX_2.rs/parameters.xml