banyak
Merge branch 'develop' of github.com:yukuku/lombapemilu into develop

Conflicts:
	android/LombaApp/src/lomba/app/CalegActivity.java