some change
Merge https://github.com/Saro50/iivi

Conflicts:
	table.sql
modified Controller
Some modify !