Merge branch 'development/v2.0'

also updated for jQuery 1.8+