Merge branch 'master' of C:\wamp\www\ProjectYes with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/manage_view.php
merged with search module, added temp header and footer
Merge pull request #2 from isnalla/v1.1

V1.1