Merge branch 'develop' into 0017-cards-edit-system
IPTV channel edit form
Merge branch '0017-cards-edit-system' into develop

Conflicts:
	sites/all/themes/custom/nng/css/main.css
Merge branch 'develop' into 0017-cards-edit-system
Merge branch '0017-cards-edit-system' into develop