Added Mockito+Powermock dependency to core pom.xml
Merge remote-tracking branch 'upstream/master'
Merge pull request #23 from dhoepelman/master

Add mocking framework
Merge remote-tracking branch 'istlab/master' into guice-final

Conflicts:
	alitheia/core/pom.xml