Management of the data loading (Rollback)
Merge branch 'master' of https://github.com/StevensMorvany/ShowOnTV

Conflicts:
	manifest.webapp