pb 8 mar
Merge branch 'master' of https://github.com/bohacekp/DMVPlayer

Conflicts:
	DMVPlayer_alpha_x/DMVPlayer_apha_7.html
changed ruler to a .png on dropbox