*update
Merge branch 'master' of https://github.com/KoMiles/emlog

Conflicts:
	content/cache/newtw.php
	content/cache/sta.php