reordering in application.js
adding required js settings
fixing display
fixing display
removed fancybox and added jquery UI
js fixes
font added and del pop partial
Merge branches 'master' and 'lj1'
Loggin Logout for user done
Merge branches 'master' and 'lj1'
adding merchant login intermedidate
working merchant signup and added Merchant session controller
added category creation when user name is ankur@gmail.com hard coded