Fix in ResourceManager to avoid GCC 4.8 parser error.

There is a problem with #elif statements in GCC 4.8 and need to be changed to #else #if.
Merge branch 'assets' into development