started moving to modular structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/videoRelated.js