Merge branch 'master' of https://github.com/sathishdevan87/jewellery

Conflicts:
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Edit.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Edit/Form.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Edit/Tab/Form.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Edit/Tabs.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Grid.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Grid_1.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Grid_2.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Grid_3.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Customertestimonials/Grid_4.php
	magento/app/code/local/Lister/Customertestimonials/Block/Adminhtml/Testimonial.php
	magento/app/code/local/Lister/Customertestimonials/Block/Receiveblock.php
	magento/app/code/local/Lister/Customertestimonials/Block/Sampleblock.php
	magento/app/code/local/Lister/Customertestimonials/Helper/Data.php
	magento/app/code/local/Lister/Customertestimonials/Model/Remarks.php
	magento/app/code/local/Lister/Customertestimonials/Model/Resource/Remarks.php
	magento/app/code/local/Lister/Customertestimonials/Model/Resource/Remarks/Collection.php
	magento/app/code/local/Lister/Customertestimonials/Model/Resource/Setup.php
	magento/app/code/local/Lister/Customertestimonials/controllers/Adminhtml/CustomerTestimonialsController.php
	magento/app/code/local/Lister/Customertestimonials/controllers/IndexController.php
	magento/app/code/local/Lister/Customertestimonials/etc/adminhtml.xml
	magento/app/code/local/Lister/Customertestimonials/etc/config.xml
	magento/app/code/local/Lister/Customertestimonials/sql/customertestimonials_setup/mysql4-install-0.1.3.php
testimonials