Updating, some syntax error fixed!
Merge remote-tracking branch 'origin/master'
Removed stupid controller, added action for add and edit item.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Some more work on the addAction
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore