no message
Merge branch 'master' of https://github.com/arixv/laika

# By Ariel Velaz
# Via Ariel Velaz
* 'master' of https://github.com/arixv/laika:
  no message

Conflicts:
	data/laika_urltester.sql