Changes made by Himali . (himalie1@gmail.com).
Merge branch 'master' of https://github.com/himalie/MobileApp