changes in admin
Merge branch 'master' of https://github.com/mantri-govind/sell-book

Conflicts:
	protected/config/main.php
	protected/extensions/jui/EJuiDateTimePicker.php
	protected/extensions/jui/README.md
	protected/extensions/jui/assets/jquery-ui-timepicker-addon.css
	protected/extensions/jui/assets/jquery-ui-timepicker-addon.js
	protected/extensions/jui/assets/jquery-ui-timepicker-addon.min.js
	protected/modules/admin/views/category/_form.php
	protected/modules/admin/views/product/_form.php
	protected/modules/admin/views/subCategory/_form.php
	protected/modules/admin/views/university/_form.php
	protected/modules/admin/views/userInfo/_form.php
	protected/modules/admin/views/userMaster/_form.php
	protected/runtime/application.log
	themes/abound/css/abound.css
	themes/abound/css/style-blue.css
	themes/abound/css/style-brown.css
	themes/abound/css/style-green.css
	themes/abound/css/style-grey.css
	themes/abound/css/style-orange.css
	themes/abound/css/style-purple.css
	themes/abound/css/style-red.css
	themes/abound/js/charts.js
	themes/abound/views/customer/_form.php
	themes/abound/views/customer/_search.php
	themes/abound/views/customer/_view.php
	themes/abound/views/customer/admin.php
	themes/abound/views/customer/create.php
	themes/abound/views/customer/index.php
	themes/abound/views/customer/update.php
	themes/abound/views/customer/view.php
	themes/abound/views/layouts/column1.php
	themes/abound/views/layouts/column2.php
	themes/abound/views/layouts/main.php
	themes/abound/views/layouts/mainsite.php
	themes/abound/views/layouts/tpl_footer.php
	themes/abound/views/layouts/tpl_navigation.php
	themes/abound/views/personalInfo/_form.php
	themes/abound/views/personalInfo/_search.php
	themes/abound/views/personalInfo/_view.php
	themes/abound/views/personalInfo/admin.php
	themes/abound/views/personalInfo/index.php
	themes/abound/views/site/index.php
	themes/abound/views/site/login.php
	themes/abound/views/site/pages/forms.php
	themes/abound/views/site/pages/graphs.php
	themes/abound/views/site/pages/interface.php
	themes/abound/views/site/pages/tables.php
	themes/abound/views/site/pages/typography.php