asdasdasd:wq
Merge branch 'master' of https://github.com/igez/TALS

Conflicts:
	setingan/database.inc.php
Merge branch 'master' of https://github.com/igez/TALS
Merge branch 'master' of https://github.com/igez/TALS
Merge branch 'master' of https://github.com/igez/TALS
Merge branch 'master' of https://github.com/igez/TALS
Merge branch 'master' of https://github.com/igez/TALS