need to merge
trying to fix looping bug
Merge branch 'master' into Zac

Conflicts:
	jQuery.ei_plugin_development.html