bugFix - static
Merge branch 'dev' of github.com:bgerp/bgerp into dev

Conflicts:
	cms/Articles.class.php