roll
roll
Merge branch 'master' of https://github.com/fajarrizky/TariAnd

Conflicts:
	project.properties