Commit c1734bf0 authored by Amardeep Singh's avatar Amardeep Singh

Merge branch 'development' into 'master'

Merging development to master for hamara-developers See merge request !17
parents 41709db7 171c485c