Merge branch 'master' of https://github.com/bernib/QMF

Conflicts:
	index.php