..
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	student/app/finance/activate.php
...