ADD: Favourites, ordering articles and navigation, quick view FIX: Preview
FIX: Change static order route
workspace changes
Merge branch 'master' into device_service

Conflicts:
	.idea/workspace.xml
	app/views/application/_navigation.html.erb
	db/schema.rb

Merge master