some stuff
merge from develop
combining playlists and tracks modules
Merge branch 'modules-restructure' into develop

Conflicts:
	js/build/build.js
combining playlists and tracks modules