change log name has changed
clean up
please commit
Merge pull request #91 from rmdstudio/master

clean up
commented out line is added back
Merge pull request #92 from rmdstudio/master

commented out line is added back
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CHANGELOG.md
	src/libraries/anahita/domain/entity/abstract.php
	src/site/components/com_base/domains/entities/edge.php