Fix nil spotlight error
Merge branch 'viveksh-master'
[modification in jquery async]
Merge branch 'master' of https://github.com/b-change/satudunia