Fixed a problem in the linking all the required js and css files in correct order.
Merge branch 'develop'