Fixed broken link - show an article from admin panel
fixed merge conflict

Conflicts:
	app/config/app.php
	app/views/backend/article/index.blade.php