ignore
Merge branch 'master' of https://github.com/geoonn/onlineTrader-FULL

Conflicts:
	Resources/iphone/html/dealer_statistic.html