Merge branch 'master-base' of https://github.com/fbourbonnais/elapse-mocks-architecture-atmtl2012 into master-final

Conflicts:
	src/com/elapsetech/confsubmission/SubmissionServiceTest.java
Format
README