resourceloader + js error fix

* changed resourceloader method to include in big js file
* fixed id problem
* code formatting

Change-Id: I520fa4f1da59f3a5f4462688ad37bb99a483a788
Merge "resourceloader + js error fix"