Added bowerrc, more things to ignore
Updated package.json
Merge branch 'origin/develop'

Conflicts:
	package.json