make progress bar match internal epoch counter (#3061)
make progress bar match internal epoch counter (#3061)

* fix 3018, 3032

* changed progress bar for 3032
williamFalcon/pytorch-lightning,williamFalcon/pytorch-lightning