12
Merge branch 'master' of https://github.com/Eldamartwilight/ecocompany

Conflicts:
	nbproject/private/private.xml
	protected/runtime/application.log