slapp
xMerge branch 'gh-pages' of github.com:DavoudTaghawiNejad/abce into gh-pages

Conflicts:
	Agent_class.html
	Database.html
	Firm.html
	FirmMultiTechnologies.html
	Household.html
	Trade.html
	Walk_through.html
	_modules/abce.html
	_modules/abce/tools.html
	_modules/database.html
	_modules/index.html
	_modules/messaging.html
	_modules/tools.html
	_sources/installation.txt
	genindex.html
	installation.html
	objects.inv
	parameters.html
	py-modindex.html
	searchindex.js
	simulation.html