New key types added
Merge branch 'master' of https://github.com/rafica/iWAL

Conflicts:
	compiler/Target.class
	compiler/Target.java
	test.txt