[DF-3491] Disabled creation of custom properties at GetCustomProperties()
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
merged with framework_0_5_5
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
[DF-185] Merged development into framework_0_5_5_customprops
[DF-3491] Small refactoring after code-review
Merge branch 'development' into framework_0_5_5_customprops
[DF-185] merged development into framework_0_5_5_customprops
Build framework/UnitTest for android x86
Merge branch 'origin/development'
[DF-4081] x86 build of lua, xml
Merge branch 'origin/development'

Conflicts:
	Libs/libs/android/armeabi-v7a/libcrypto_android.a
	Libs/libs/android/armeabi-v7a/libcurl_android.a
	Libs/libs/android/armeabi-v7a/libssl_android.a
	Libs/openssl/Makefile
	Libs/openssl/Makefile.bak
[DF-4081] update openssl, curl
[DF-4081] update fmod libraries
[DF-4081] fix enum value
[DF-4081] fix make file
Merged with development
[DF-4164] revert eGPUFamily
[DF-4081] fix review comment
Merge branch 'development' into framework_0_5_5_customprops