Merge branch 'develop' of ssh://gehu.iyank4.com/kwitangp into develop

Conflicts:
	backend/schema/database.sql
Tulang punggung untuk tipe-konten
Merge branch 'develop'