Merge branch 'dev-master' into dev-3.x
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x
Updated selleck test to reflect code change @ 993fe2.  Resolves #1134.
Merge branch 'live-docs' into dev-master
Update simpleyui for src build.
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x
Merge branch 'dev-master' into dev-3.x

Conflicts:
	build/simpleyui/simpleyui-min.js

Merge dev-master into dev-3.x