Use newer version of bower
Tracks were switched between two albums
Link to new bower_components directory
Merge branch 'master' into dist

Conflicts:
	.gitignore