Added local jquery for testing
Merge branch 'adam'