Ganti DB
Merge branch 'master' of https://github.com/aongko/shamir

Conflicts:
	protected/models/activeRecord/ClassReview.php
	protected/models/activeRecord/LtCity.php
	protected/models/activeRecord/LtClassCategory.php
	protected/models/activeRecord/LtDiscussionCategory.php
	protected/models/activeRecord/LtUserType.php
	protected/models/activeRecord/MasterAccount.php
	protected/models/activeRecord/MasterCity.php
	protected/models/activeRecord/MasterClass.php
	protected/models/activeRecord/MasterClassCategory.php
	protected/models/activeRecord/MasterDiscussionCategory.php
	protected/models/activeRecord/MasterMenu.php
	protected/models/activeRecord/MasterProfile.php
	protected/models/activeRecord/MasterSession.php
	protected/models/activeRecord/MasterUserType.php
	protected/models/activeRecord/MsAccount.php
	protected/models/activeRecord/MsClass.php
	protected/models/activeRecord/MsProfile.php
	protected/models/activeRecord/MsSession.php
	protected/models/activeRecord/TrClassReview.php
	protected/models/activeRecord/TrDiscussion.php
	protected/models/activeRecord/TrDocs.php
	protected/models/activeRecord/TrFiles.php
	protected/models/activeRecord/TrForumDiscussion.php
	protected/models/activeRecord/TrRating.php
	protected/models_bak/activeRecord/ClassReview.php
	protected/models_bak/activeRecord/MasterAccount.php
	protected/models_bak/activeRecord/MasterCity.php
	protected/models_bak/activeRecord/MasterClass.php
	protected/models_bak/activeRecord/MasterClassCategory.php
	protected/models_bak/activeRecord/MasterDiscussionCategory.php
	protected/models_bak/activeRecord/MasterMenu.php
	protected/models_bak/activeRecord/MasterProfile.php
	protected/models_bak/activeRecord/MasterSession.php
	protected/models_bak/activeRecord/MasterUserType.php
	protected/models_bak/activeRecord/TrDocs.php
	protected/models_bak/activeRecord/TrForumDiscussion.php
	protected/models_bak/activeRecord/TrPostRating.php
	protected/models_bak/activeRecord/TrPriviledge.php
	protected/models_bak/activeRecord/TrVideoRating.php
	protected/models_bak/activeRecord/User.php