Fixed app registering multiple times
Merge branch 'mhe_dev'