Medication View Added and Application Icon Added
Merge branch 'origin/master'