Merge branch 'droidcon' of github.com:novoda/SimpleEasyXmlParser into cketti-test_integer_wrapper_private_constructor

Conflicts:
	sexp/src/test/java/com/novoda/sexp/marshaller/IntegerWrapperBodyMarshallerShould.java

Conflicts:
	sexp/src/test/java/com/novoda/sexp/marshaller/IntegerWrapperBodyMarshallerShould.java