moved activity to correct folder
changes will be overwritten
fixed conflicts
added create group button to dashboard activity