fade-in
Merge remote-tracking branch 'origin/f7' into f7

Conflicts:
	js/templates/blogs.html
	js/templates/tv.html
	js/views/newsView.coffee
fade-in