add fragmentactivity with drawer, photoalbums screen
add fragmentactivity with drawer, photoalbums screen + fix merge