updates
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
properties