Adds links to the Favorite and Feed index on the master page
Modifies the Favorite Controller and Program Details view
Modifies the Favorite Controller and Program Details view (2)
Solves conflicts
Updates indentation
Resolves conflicts
Merge branch 'master' into public-programs-2
Merge branch 'master' into public-programs-2
Merge branch 'master' into public-programs-2
Adds the DataTable plugin and updates the Feed page
Updates the Favorite and Feed views
Merge branch 'master' into public-programs-2
Adds the possibility to set a program as favorite on the feed page
Merge branch 'master' into public-programs-2
Merge branch 'master' into public-programs-2
Merge pull request #20 from dygcao/public-programs-2

Public programs 2