Merge branch 'master' of K:\Veeb\kuuluta_vabalt with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/master_template.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
ads list styling
ads list styling