commit
Merge branch 'master' of https://github.com/adhigunasurya/JalinSuara

Conflicts:
	workspace/JalinSuara/project.properties
Merge branch 'master' of https://github.com/adhigunasurya/JalinSuara
commit
Merge branch 'master' of https://github.com/adhigunasurya/JalinSuara
Merge branch 'master' of https://github.com/adhigunasurya/JalinSuara
commit
Merge branch 'master' of https://github.com/adhigunasurya/JalinSuara