added admin controller and many other additions
merge conflict resolved
Merge branch 'mergeconflict'

Conflicts:
	application/controllers/photo.php
	application/controllers/user.php
	application/models/photo_model.php
fixed comments