add content table
Merge branch 'master' into juris

Conflicts:
	fuel/app/config/development/migrations.php
merge
migration fix
Merge remote-tracking branch 'origin/master' into juris
work section, 1 more migration and user options
nothin special
model validations + working edit text
working material operations[create,edit,delete](text_only)
Merge branch 'juris'