merge
Merge branch 'master' of https://github.com/ondemande17/TelkomTalk

Conflicts:
	nbproject/private/private.xml