Merge pull request #14 from niravpatel2008/developer

Developer
Merge pull request #15 from niravpatel2008/developer

Location related changes
Merge pull request #16 from niravpatel2008/developer

UI correction
new front template
Merge fix
Merge pull request #17 from niravpatel2008/aniket

new front template
Search layout setup