first deploy
mend
Merge branch 'master' of https://github.com/T1bald/StairwaySounds

Conflicts:
	ss-general-web/src/main/webapp/WEB-INF/glassfish-web.xml
Merge branch 'master' of https://github.com/T1bald/StairwaySounds

Conflicts:
	ss-general-web/src/main/webapp/WEB-INF/glassfish-web.xml
night commit
Merge branch 'master' of https://github.com/T1bald/StairwaySounds
Now you can add new playlists
playlists editing v.0.1
Merge branch 'master' of https://github.com/T1bald/StairwaySounds

Conflicts:
	ss-general-web/src/main/webapp/WEB-INF/glassfish-web.xml