Merge pull request #3 from pandorafpa/f/fpa-tv

F/fpa tv
update to production
fix conflicts
edit map chart bug