Local changes
Merge branch 'master' of https://github.com/warmon/NextTV
layouts
merge
merge
Merge branch 'master' of https://github.com/warmon/NextTV

Conflicts:
	css/style.css
Add/remove Favorites
Add/remove Favorites
Static page - Faq
merge
comment Tabs
Merge branch 'master' of https://github.com/warmon/NextTV

Conflicts:
	css/style.css
merge
Merge branch 'master' of https://github.com/warmon/NextTV

Conflicts:
	css/style.css
#MWR-922
merge
Merge branch 'master' of https://github.com/warmon/NextTV

Conflicts:
	css/style.css
#MWR-930
Merge branch 'master' of https://github.com/warmon/NextTV

Conflicts:
	css/style.css
	js/main.js
Merge branch 'master' of https://github.com/warmon/NextTV

Conflicts:
	css/style.css