merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	perl-mvc/application/qb.pl