sadf
Merge branch 'master' of https://github.com/jonasgreen/Plastic

Conflicts:
	src/com/jonasgreen/plastic/generator/DSLPlugin.java
	src/com/jonasgreen/plastic/generator/Generator.java
	src/com/jonasgreen/plastic/generator/javafile/ClazzImpl.java