Merge chema

Conflicts:
	index.php
Merge chema

Conflicts:
	index.php
Merge aida
Revert ""

This reverts commit eda00cb5509902214b8acb49f70162c590efaa94.