fixed login.tpl - placeholders
implemented query
Merge branch 'master' of mojotrollz.eu:system

Conflicts:
	sai/modules/saimod_sys_locale/saimod_sys_locale.php
sys cron mod proto
Merge branch 'master' of mojotrollz.eu:system
created webcraft dummy logo
sys api sql fix
Merge branch 'master' of mojotrollz.eu:system
cron sai mod
updated file HEADER-sending
files header fix for downloads
adding new text categories is now possible
Merge branch 'master' of mojotrollz.eu:system
cron sql schema
Merge branch 'master' of mojotrollz.eu:system
added missing sql for locale -> renamed to text in api call
Merge branch 'master' of mojotrollz.eu:system into textapi

Conflicts:
	dbd/sql/mysql/data/system_api.sql
pagestate system, js implementation @ mojotrollz
basic string close
Merge branch 'master' of mojotrollz.eu:system