update path and arguments
Merge commit 'e53a9a3111fd384a271aa1ec9a4921a13d0801cb' into dev_test

Conflicts:
	FaceDetectionApp/main.cpp
Merge remote-tracking branch 'origin/master' into dev_test
Merge remote-tracking branch 'origin/master' into dev_test
Merge remote-tracking branch 'origin/master' into dev_test
Merge remote-tracking branch 'origin/master' into dev_test
Merge commit 'a797a3a411e95250aff7fbfca2719a5d4ee19e13' into dev_test

Conflicts:
	FaceDetectionLib/activities.h
Merge commit '6917ad4aacf5a6ee02fadf6e84f6ea4f087c9408' into dev_test
Models can be preloaded now
Merge commit 'a3009fa5f99eb2d9ba9549782f5afe4275a4a560' into dev_test
Merge branch 'master' into dev_test