Repost model/account.
Merge branch 'master' of https://github.com/Diana22/ProjectMVC

Conflicts:
	app/model/account.php
Implement page: Edit ingredient.
Merge branch 'master' of https://github.com/Diana22/ProjectMVC

Conflicts:
	app/config/config.php
	app/controller/cake.php
	app/model/database.php
	app/view/admin_index.tpl.php
	app/view/ingredient_updated.tpl.php