1. deal entity with dao and service laye added
2. MerchantController added
3. views for merchant added