merge with andrew
GAE add maps to lots - partial
GAE marker on map
Merge remote-tracking branch 'github/master'
Merge remote-tracking branch 'team-github/master' into jeff
This commit only changes the index.jsp page.
The BuildingJdo.java file needs these two methods:

@SuppressWarnings("unchecked")
	public static List<BuildingJdo> getFirstBuildings(int number) {
		PersistenceManager pm = PMF.get().getPersistenceManager();
		List<BuildingJdo> results = null;
		try {
		
			Query q = pm.newQuery(BuildingJdo.class);
			q.setOrdering("name asc");
			
			results = (List<BuildingJdo>)q.execute();
		} catch (Exception e) {
			
		}
		return results;
	}
	@SuppressWarnings("unchecked")
	public static List<BuildingJdo> getBuildingsFromCampus() {
		PersistenceManager pm = PMF.get().getPersistenceManager();
		List<BuildingJdo> results = null;
		try {
			// Query all the buildings within a given campus
			Query q = pm.newQuery(BuildingJdo.class, "Fairfax");
			results = (List<BuildingJdo>)q.execute();
		}
		catch (Exception e) {
			// Put something here?
		}
		return results;
	}