.
Merge branch 'master' of https://github.com/dokuku/EToko

Conflicts:
	EToko.v11.suo
register telkom
Merge branch 'master' of https://github.com/dokuku/EToko

Conflicts:
	EToko.Web/Scripts/etoko.js
	EToko.v11.suo