#1263 flowplayer play/pause
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/js/jquery.aplayer.js
Merge branch 'master' of github.com:moonion/avreg-site
Merge branch 'master' of github.com:moonion/avreg-site

Conflicts:
	lib/js/flowplayer/aplayerfncs.js
Merge remote-tracking branch 'origin/master'