First commit on search and pagination on manage_users.php
Fixed conflict in manage_users.php

Merge branch 'master' of https://github.com/Walkingmage/OHLALA

Conflicts:
	manage_users.php