final_bancakan

final_bancakan
Merge remote-tracking branch 'origin/master'

Conflicts:
	activation.php
	assets/user/3.jpg
	checkin.php
	custom.css
	detail.php
	event.php
	getData.php
	index.php
	jelajah.php
	komen.php
	login.php
	permainan.php
	profile.php
	register.php