fix for StaticLibrary's header files when it been used in ARC
Merge branch 'dev2' into arc2