delete admin functions
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo
- experiment new form for material
- .
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo
- revamped/combined material add/edit form
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into team1/exp/newformmaterial
faqs view
orange subtitle
Merge pull request #294 from BuracayBeach/teamYaywuhooo

faqs view
Merge pull request #295 from BuracayBeach/team_UI

orange subtitle
delete an admin feature
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team3_v2.9
Merge pull request #296 from BuracayBeach/team3_v2.9

Team3 v2.9
Merge remote-tracking branch 'origin/master'
Merge branch 'team1/exp/newformmaterial'
Merge pull request #297 from BuracayBeach/team1/dev

Team1/dev