Initial Merge 

Initial merged file upload. Map/Login Activities.