modified:   etc/growpy.conf
	modified:   growpy/core/base.py
	modified:   growpy/core/collector.py
	modified:   growpy/core/config.py
	modified:   growpy/main.py
	modified:   growpy/persistence/orm.py
Merge branch 'master' of github.com:mnothic/growpy_agent

Conflicts:
	etc/growpy.conf