Fixed some misc Bugs
Merge branch 'master' of https://github.com/crew/dds-server

Conflicts:
	wp-content/plugins/dds-api/dds-api.php