test commit..
Setting SSL to not override to true. So the config will at least do something.
Merge branch 'master' of https://github.com/ThumbWhere/ThumbWhere-PHP5-WebServiceLibrary

Conflicts:
	services/APIProgram.class.php
Merge branch 'dev'