Gemfile.lock
Changed Google Reader link to Feedly
Fixed typo
Removed links tab, and windows 8 tab, as nobody uses them.
Fixed lazy loaded images when using the filter
Removed links link from header in mobile view
HTML Widget
Added utm_source to urls
Added utm_source to the short urls
added city to tweet messages
Added urm_source to email links
Updated tests
Merge branch 'master' into bootstrap3

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	app/views/shared/_navigation.html.erb