- new fonts and shit
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
changes by rey commit for merge
Merge branch 'master' of http://github.com/BuracayBeach/myfirstrepo into team_UI
fixed receive module
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team3_v2.0
Merge pull request #140 from BuracayBeach/team3_v2.0

Team3 v2.0
Search bar and Table Positioning
Merge pull request #141 from BuracayBeach/team_UI

Team ui
- fixed faqs for users
- new material type 'other'
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/search_results_view.php
Merge pull request #142 from BuracayBeach/team1/develop

Team1/develop
Updated update user account with safeguard courtesy of Allan
Updated user update