Merge branch 'hotfix-server-changes'
Merge branch 'hotfix-activities-page-notloggedin'
Merge remote-tracking branch 'origin/master'
Added __unicode__ and verbose_name for niqati models
Customized admin for niqati app
Merge branch 'hotfix-niqati-models-unicode'
Added notification (warning) message when niqati order form is being used
Enhanced admin for niqati
Merge branch 'hotfix-niqati-big-orders' into develop