fixed a bug in Factory
resolved merge conflict
added Entity->addField($field) to make named indexex possible
moved template creation to Controller.php->__contruct()
Merge branch 'develop' of https://github.com/nahakiole/fredyframework into develop
Merge branch 'dev/steve' into develop