- new fonts and shit
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
- 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