Database work..
Merge remote-tracking branch 'origin/master'

Conflicts:
	financialmarketsimulator/FinancialMarketSimulator/nbproject/private/private.properties