major styling improvements
major styling improvements2
entries index conflict resolved

Merge branch 'views2' into development

Conflicts:
	app/views/entries/index.html.haml