Init
--amend
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.xml
	codenameone_settings.properties
	nbproject/build-impl.xml
	nbproject/project.properties
	nbproject/project.xml
	src/dk/emhermunk/STADS.java
	src/generated/StateMachineBase.java
	src/theme.res
	src/userclasses/StateMachine.java
Merge remote-tracking branch 'origin/master'
Support for SDU!