added medication details activity
fixing conflicts
fixing conflicts

removing bin/ and gen/ folders from git
removed androidrx bin and gen from git