alpha added
mask added and scale unified
Fine tuning
.orig crap
Merge branch 'marc' into denny

Conflicts:
	Drole1.5/bin/.gitignore
	Drole1.5/src/drole/Main.java
User Position to MM
Scaling
Merge branch 'chrisNeu' into denny

Conflicts:
	Drole1.5/bin/.gitignore
	Drole1.5/src/drole/Main.java
UHOH Assizitation Crap :)
refining architecture intro
code cleaning