Added two new factories, activities and user
Activity rewritten to angular