Merge branch 'master' of github.com:moonion/avreg-site

Conflicts:
	lib/js/flowplayer/aplayerfncs.js