Merge branch 'joaobiriba-droidcon' into droidcon

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