working on entries
adds read article filtering on entries index
Merge branch 'development' of github.com:laurentqro/cantine into development
minor tweaks
user feed profile feed links fixed
Merge branch 'development' of github.com:laurentqro/cantine into development
adds private subscription filtering to user view
major styling improvements
major styling improvements2
entries index conflict resolved

Merge branch 'views2' into development

Conflicts:
	app/views/entries/index.html.haml
back button and more styling
Merge branch 'development'
topbar links
adds cancan
Merge branch 'development' of github.com:laurentqro/cantine into development
topbar and sidebar styling done
Merge branch 'views2' into development
styling DONE
entry styling
adds pagination to feeds and entries