financien
Merge remote-tracking branch 'origin/master'

Conflicts:
	student/app/finance/activate.php
	student/app/finance/index.php
Merge branch 'master' of https://github.com/barroc-it/barroc-it

Conflicts:
	student/app/development/indexsearch.php