code improvements
deleted entire project to prepare full merge with "advanced branch"
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php