Add main and ignore for bower
Merge branch 'master' into 1.1.0-beta

Conflicts:
	package.json