- lol
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/create_admin_view.php
	application/views/home_contents_view.php
	js/faq_manager.js
- fixed sources
Merge remote-tracking branch 'origin/master'
- fixed form, AGAIN
Merge pull request #349 from BuracayBeach/team1/dev

Team1/dev