Start use vex
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/resources/client/module/user/view/script/SongView.js
	src/main/webapp/resources/client/module/user/view/templates/Song.html