Merge branch 'master' of https://github.com/londomloto/tetuka

Conflicts:
	jatayu/config/config.php
	jatayu/config/database.php