unimportant things
Merge branch 'develop' of https://github.com/hectorjjb/dancehub.git into
develop

Conflicts:
	videoview/video.js