Merge origin/master

Conflicts:
	MatematicaFinanciera-App/src/Design/MainFrame.java
Merge origin/master