- Nothing, just want to ignore properties files
+ proj files
Merge branch 'master' of https://github.com/lesslucifer/penguin-server-cluster

Conflicts:
	MinaConnection/nbproject/private/private.properties
	MinaConnection/nbproject/private/private.xml
	SPLoadBalancer/nbproject/private/private.properties
	SPShare/nbproject/private/private.properties