edited nginx.conf
Merge branch 'meru_deviceapp' of https://github.com/charugvvdn/Meru into meru_deviceapp