Added Mockito+Powermock dependency to core pom.xml
Merge branch 'master' into webadmin_refactoring

Conflicts:
	alitheia/core/pom.xml