Update to 2.0
Update to 2.0
Merge branch 'master' into develop

Conflicts:
	assets/tvs/multitv/includes/multitv.class.php
	assets/tvs/multitv/js/multitv.js