fixed unittests
fix parent app
Merge remote-tracking branch 'origin/master' into timor/gapp