updated app model
added icon to apps list again
added mockito lib and sample activity test