Project clean
Project clean 2
Merge index classes

Conflicts:
	admin/index.php