fix
Merge branch 'master' of https://github.com/mrhack/dipei

Conflicts:
	static/sta.php
add
Merge branch 'master' of https://github.com/mrhack/dipei