fixed some issues with the functions
Merge branch 'master' of github.com:rop-productops/yolo-of-the-day

Conflicts:
	scw/DatabaseforSCW.php
	scw/config/database.php
Merge branch 'master' of github.com:rop-productops/yolo-of-the-day