Modified package structure. Starting acceptance tests.
Merge branch 'master' of https://github.com/j-dasilva/cms

Conflicts:
	src/cms/persistence/DataAccessStub.java