updates
Version 2.1
Version 2.1
Version 2.2 (Preview version)
ruben
Merge branch 'rc' of https://github.com/frankbonnet/PAS into development

Conflicts:
	nbproject/project.properties
	src/pas/financial/Collection.java
	src/pas/financial/Cost.java
	src/pas/layout/MainFrame.java
	src/pas/layout/panel/Background.java
	src/pas/main/Main.java
	src/pas/resources/background.jpg
Version 2.2 (Preview version)
properties
Version 2.2 (Preview version)
Version 2.2 (Preview version)
Version 2.2.1 (Models)
Version 2.2.1 (Models)
Version 2.3 (Models)
Version 2.3 (Models)
pas.financial
Merge branch 'rc' of https://github.com/frankbonnet/PAS into development
Version 2.3 (Models)
Merge branch 'rc' of https://github.com/frankbonnet/PAS.git into rc