Fixed and removed some unit tests
Added missing services for the tests
Updated integration tests to use the motech-pax-it
Fixed problems with osgi bundles
Added missing tests
Test fixes

follow-up
Merge remote-tracking branch 'upstream/phase2' into phase2

Conflicts:
	mtraining/src/main/java/org/motechproject/whp/mtraining/web/domain/Bookmark.java
	mtraining/src/test/java/org/motechproject/whp/mtraining/web/controller/BookmarkControllerTest.java
Fixed unit tests after Bookmark refactorization