Remove dummy code... o.O
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ch/fhnw/oop2/cantonapp/model/importCantons.java
Create some view things