Merge remote-tracking branch 'origin/master'

Conflicts:
	addSub.php

asasas

asasas

asfdsaf

sdfsdaf