Fixing TOTAL CHAOS O_o

This reverts commit 8eee23decf73bf197b0e60c0401ffae1ecf0c121.

Conflicts:
	View/Actions/add.ctp
	database.sql