QUASAR: Remove superfluous spaces from main.js
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration
Merge branch 'ceres' of ssh://helios/home/git/repositories/Nova into ceres
CERES: Working on developing Ceres backend

Started on the Ceres nodejs servlet, committing so that I might
test the servlet on another ip.
CERES: XML Parsing works in GridActivity

Login page will send you to GridActivity, which will parse the 
XML received from the socket and lay it out in the grid.
CERES: WIP on Server jstoxml
Derp
QUASAR: Fix weird if-else structure
MULT: Method to get suspectInfo as array 

Basic method right now, just gets the suspects as a
string of the form "IP:IFACE:CLASS" to test
NODEJS: Use stringstream to concatenate strings

Won't let me use +
NODEJS: Trying to pass an array to callback, v8 style
CERES: Make server send all suspects

Works, but takes like 2 tries before it starts working because of
the way the suspectTable is divided between Nova and the web
C++ stuff. Need to find a way to have the suspects in the server
side before a call is made to get them. Also need to override 
notifyDataSetChanged to sort the list before updating the 
adapter.
CERES: Fix some macro usage, remove debug print, get suspects first time

Was using 1 and 0 for setVisibility, turns out 0 is Visible and 0x40000000 is
Invisible, so...yeah. Fixed that. Made the wait for the network timeout 
longer, so the suspects get loaded the first time. Might just make it wait
until the message comes in, no matter how long, but until I can test it on
an actual device that isn't the AVD I'll leave it as it is. Removed some
unused imports, implemented a custom comparator for sorting the Grid 
by classification.
CERES: WIP for detailedSuspect XML
CERES: WIP for detailedSuspect XML
CERES: Fix some server errors, check that XML is coming through

XML is being transmitted properly, just need an Activity to send 
it to.
CERES: Receiving XML for detailed suspects working

Just need an activity to move the data to
CERES: Add preliminary DetailsActivity

Currently just shows the suspect ID in a text box. It will need to be
modified to load the full suspect details over web sockets and
display it in a meaningful way.
Merge branch 'ceresConnect' of ssh://helios/home/git/repositories/Nova into ceresConnect

Conflicts:
	Ceres/src/com/datasoft/ceres/GridActivity.java