make titles consistent
Merge branch 'pretty_making' into develop
Merge branch 'dj_and_clockwork' into develop

Conflicts:
	app/views/entries/widget_index.html.haml
Merge pull request #11 from awesomizer/develop

Develop