some mapgenerator stuffs
Merge branch 'master' of github.com:poi33/Funler

Conflicts:
	funler/src/funler/Funler.java
	funler/src/funler/Map.java
Merge branch 'master' of github.com:poi33/Funler

+ lot's of new content

Conflicts:
	funler/src/funler/Funler.java