added "main"
Merge branch 'master' of github.com:thomaswelton/jquery-ui-amd

Conflicts:
	bower.json