EInstellungen
Merge branch 'master' of https://github.com/kegrosch/Workspace_NEU

Conflicts:
	Schiffe_09_11_2012_test/target/.history

	modified:   Schiffe_09_11_2012_test/lift_proto.db.h2.db
	deleted:    Schiffe_09_11_2012_test/lift_proto.db.lock.db
	modified:   Schiffe_09_11_2012_test/src/main/scala/code/snippet/Feld.scala
	modified:   Schiffe_09_11_2012_test/src/main/scala/code/snippet/SchiffeSetzen.scala
	new file:   Schiffe_09_11_2012_test/src/main/webapp/images/Kreuzer.png
	new file:   Schiffe_09_11_2012_test/src/main/webapp/images/Schlachtschiff.png
	new file:   Schiffe_09_11_2012_test/src/main/webapp/images/UBoot.png
	new file:   Schiffe_09_11_2012_test/src/main/webapp/images/Zerstoerer.png
	modified:   Schiffe_09_11_2012_test/src/main/webapp/index.html
	modified:   Schiffe_09_11_2012_test/target/.history
	modified:   Schiffe_09_11_2012_test/target/scala_2.8.1/analysis/applications
	modified:   Schiffe_09_11_2012_test/target/scala_2.8.1/analysis/dependencies
	modified:   Schiffe_09_11_2012_test/target/scala_2.8.1/analysis/external
	modified:   Schiffe_09_11_2012_test/target/scala_2.8.1/analysis/generated_files
	modified:   Schiffe_09_11_2012_test/target/scala_2.8.1/analysis/hashes
	modified:   Schiffe_09_11_2012_test/target/scala_2.8.1/analysis/tests
	deleted:    Schiffe_09_11_2012_test/target/scala_2.8.1/classes/code/snippet/Feld$$anonfun$createPcFeld$1$$anonfun$apply$2$$anonfun$apply$3.class
	modified:   Schiffe_09_11_2012_test/target/scala_2.8.1/classes/code/snippet/Feld$$anonfun$createPcFeld$1$$anonfun$apply$2.class
	modified:   Schiffe_09_11_2012_test/target/scala_2.8.1/classes/code/snippet/Feld$$anonfun$createPcFeld$1.class