Removing the hashing system / to be replace by tag based detection
Merge fixes

Conflicts:
	Song.js