fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/module/articles/delete.php
	admin/module/articles/delete_group.php
	define.php
	parts/html/footer.php
	parts/html/nav.php
	templates/main.php