Sync svn.
Remove ^M.
Remove ^M.
Merge branch 'svnversion'

Conflicts:
	application/config/routes.php
	application/controllers/activity.php
	application/controllers/feed.php
	application/controllers/group.php
	application/controllers/groupbuy.php
	application/controllers/manager.php
	application/controllers/shop.php
	application/controllers/user.php
	application/models/activity_model.php
	application/models/group_model.php
	application/models/groupbuy_model.php
	application/models/manager_model.php
	application/models/shop_model.php
	application/models/user_model.php
	application/views/base/mainnav.php
	application/views/groupbuy/vieworder.php
	application/views/manager/group_header.php
	application/views/manager/header.php
	application/views/manager/shop/shop_modify.php
	page/js/shop_manager_modify.js
Merge branch 'feature/ca007/newact'