many things changed
Merge branch 'master' of https://github.com/OrangeeWeb/Scrolldier

Conflicts:
	admin/mysql/connect.php