Added login drop down, updated new resource animation time and return error message
Merge branch 'master' of https://github.com/zhaoyan1117/PeakDemand