core_Setup.inc.php hotFix
Merge remote-tracking branch 'origin/RC2' into RC1

Conflicts:
	core/Setup.inc.php
hotFix
Merge remote-tracking branch 'origin/RC2' into RC1
Merge branch 'hotfix' of github.com:bgerp/ef into hotfix

Conflicts:
	core/Setup.inc.php
Новата версия от Dev на Setup.inc.php
Новата версия от Dev на Setup.inc.php пак
Setup: bugfix
Setup: hotfix
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Merge branch 'hotfix' into setup