fixed some warnings and a geneticPanelController
Merge branch 'master' of git://github.com/Ramqvist/Simulated-ecosystem

Conflicts:
	src/chalmers/dax021308/ecosystem/view/MainWindow.java
	src/chalmers/dax021308/ecosystem/view/NEWSettingsMenuView.java
	src/chalmers/dax021308/ecosystem/view/mapeditor/AddObstacleView.java
	src/chalmers/dax021308/ecosystem/view/mapeditor/EditObstaclesView.java
	src/chalmers/dax021308/ecosystem/view/populationsettings/GeneticPanel.java
Merge branch 'master' of git://github.com/Ramqvist/Simulated-ecosystem

Conflicts:
	src/chalmers/dax021308/ecosystem/view/MainWindow.java
	src/chalmers/dax021308/ecosystem/view/SettingsView.java
Merge branch 'master' of git://github.com/Ramqvist/Simulated-ecosystem

Conflicts:
	src/chalmers/dax021308/ecosystem/view/SettingsView.java