Editing on the same line
Merge branch 'master' of github.com:hendriqis/systemsetup

Conflicts:
	Web/Secure/Transaksi/Informasi/Default.aspx.vb