...
...
...
Merge branch 'master' of https://github.com/iYottt/boffice
...
Merge branch 'master' of https://github.com/iYottt/boffice

Conflicts:
	application/modules/fund/views/index.php
	application/modules/fund/views/project/project_support/form.php
...