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

Conflicts:
	workspace/JalinSuara/src/com/jalinsuara/android/project/SubProjectFragment.java