On branch 1.1
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)
	new file:   explorer.war
	modified:   src/META-INF/persistence.xml
	modified:   src/log4j.properties
	new file:   src/uk/ac/ox/map/domain/CountryAll.java
	new file:   src/uk/ac/ox/map/domain/CountryAll_.java
	modified:   src/uk/ac/ox/map/domain/ExplorerLayer.java
	modified:   src/uk/ac/ox/map/domain/ExplorerPerspective.java
	new file:   src/uk/ac/ox/map/domain/G6PD.java
	new file:   src/uk/ac/ox/map/domain/G6PD_.java
	new file:   src/uk/ac/ox/map/domain/HBS.java
	new file:   src/uk/ac/ox/map/domain/HBS_.java
	new file:   src/uk/ac/ox/map/explorer/client/event/G6PDCheckedEvent.java
	new file:   src/uk/ac/ox/map/explorer/client/event/G6PDSelectedEvent.java
	new file:   src/uk/ac/ox/map/explorer/client/event/HbSCheckedEvent.java
	new file:   src/uk/ac/ox/map/explorer/client/event/HbSSelectedEvent.java
	modified:   src/uk/ac/ox/map/explorer/client/list/presenter/BaseSelectionPresenter.java
	new file:   src/uk/ac/ox/map/explorer/client/list/presenter/G6PDDataProvider.java
	new file:   src/uk/ac/ox/map/explorer/client/list/presenter/G6PDSelectionPresenter.java
	new file:   src/uk/ac/ox/map/explorer/client/list/presenter/G6PDTablePresenter.java
	new file:   src/uk/ac/ox/map/explorer/client/list/presenter/HbSDataProvider.java
	new file:   src/uk/ac/ox/map/explorer/client/list/presenter/HbSSelectionPresenter.java
	new file:   src/uk/ac/ox/map/explorer/client/list/presenter/HbSTablePresenter.java
	modified:   src/uk/ac/ox/map/explorer/client/list/view/CountryTableView.java
	new file:   src/uk/ac/ox/map/explorer/client/list/view/G6PDTableView.java
	new file:   src/uk/ac/ox/map/explorer/client/list/view/HbSTableView.java
	new file:   src/uk/ac/ox/map/explorer/client/map/presenter/G6PDMapInfoPresenter.java
	new file:   src/uk/ac/ox/map/explorer/client/map/presenter/G6PDMapPresenter.java
	new file:   src/uk/ac/ox/map/explorer/client/map/presenter/HbSMapInfoPresenter.java
	new file:   src/uk/ac/ox/map/explorer/client/map/presenter/HbSMapPresenter.java
	new file:   src/uk/ac/ox/map/explorer/client/proxy/CountryAllProxy.java
	new file:   src/uk/ac/ox/map/explorer/client/proxy/G6PDProxy.java
	modified:   src/uk/ac/ox/map/explorer/client/resource/ResourceBundle.java
	modified:   src/uk/ac/ox/map/explorer/client/resource/base.css
	modified:   src/uk/ac/ox/map/explorer/client/resource/panel.css
	new file:   src/uk/ac/ox/map/explorer/client/rpc/G6PDService.java
	new file:   src/uk/ac/ox/map/explorer/client/rpc/G6PDServiceAsync.java
	new file:   src/uk/ac/ox/map/explorer/client/rpc/HbSService.java
	new file:   src/uk/ac/ox/map/explorer/client/rpc/HbSServiceAsync.java
	modified:   src/uk/ac/ox/map/explorer/client/rpc/MapInfoService.java
	modified:   src/uk/ac/ox/map/explorer/client/rpc/MapInfoServiceAsync.java
	modified:   src/uk/ac/ox/map/explorer/server/ExcelServlet.java
	new file:   src/uk/ac/ox/map/explorer/server/ExcelServletAll.java
	new file:   src/uk/ac/ox/map/explorer/server/G6PDQuery.java
	new file:   src/uk/ac/ox/map/explorer/server/G6PDServiceImpl.java
	modified:   src/uk/ac/ox/map/explorer/server/GuiceServletModule.java
	new file:   src/uk/ac/ox/map/explorer/server/HbSQuery.java
	new file:   src/uk/ac/ox/map/explorer/server/HbSServiceImpl.java
	modified:   src/uk/ac/ox/map/explorer/server/MapInfoServiceImpl.java
	modified:   src/uk/ac/ox/map/explorer/server/PrQuery.java
	modified:   war/WEB-INF/templates/MapExplorer.ftl
Perspectives for Pv, Duffy, G6PD and Sickle-Cell added
Merge pull request #1 from malaria-atlas-project/1.1

Update .gitignore
Update .gitignore
Merge github.com:malaria-atlas-project/Explorer into 1.1