spacing and cleanup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	html/libs/primary.php
fix spacing
Merge branch 'master' of github.com:bifek/freedns into bifek-master
Merge branch 'bifek-master'