added html generator back into journal example
Merge branch 'develop' of github.com:nahakiole/fredyframework into develop
moved entity namespace to controller, otherwise it has to be passed on every call
Updated font-awesome to 4.1.0