alpha added
mask added and scale unified
Merge branch 'marc' into denny

Conflicts:
	Drole1.5/bin/.gitignore
	Drole1.5/src/drole/Main.java