Add jquery.waitforimages plugin
Fix merge conflict