ignore application.conf
Merge branch 'master' into Bohan-Zheng