reset
Merge branch 'develop' of https://github.com/FutureTV/fwd into develop