breadcrumb features and relavant issues...for category and article
Merge branch 'master' into feature/breadcrumb

Conflicts:
	app/views/admin/category/index.html.haml
	app/views/admin/category/show.html.haml
	app/views/admin/index.html.haml
	app/views/article/show.html.haml