user view dan images
Merge branch 'master' of https://github.com/pandahitam/infolapangan

Conflicts:
	.gitignore
	protected/views/user/adminIndex.php