Merge branch 'master' of https://github.com/risangpratama13/sli_lipi

Conflicts:
	.htaccess