Removed temporary backup files left over by gedit
File changes
Migrated from mysql to mysqli
Minor changes, prepare to merge with remote
Merges after pull from github
Merge branch 'master' of https://github.com/atrctr/starmap

Conflicts:
	lang/en.php~
	planet.php~