Merge pull request #5 from opichon/master

added bower config
updated bower.json
Merge branch 'upstream/master'

Conflicts:
	bower.json