Merge branch 'august2012' of github.com:ccnmtl/SherdJS into unstable
Merge branch 'spring2013' of github.com:ccnmtl/SherdJS into unstable
Merging spring2013 into unstable.
Merge branch 'master' of github.com:ccnmtl/SherdJS into unstable

Conflicts:
	lib/mcePlugin_citation
jshint
minifying for externals