edit-item
message-and-messageContent-table-redesigned
message-and-messageContent-table-redesigned1
message-displayed-properly
message-input-work-properly
direct-link-to-new-chatbox-upon-bidding
notification-feature
facebook-retrieve-image
refactoring-initial-state
refactoring-initial-state1
api-add-comment-unfinished
change-name-controller-action
Merge remote-tracking branch 'origin/master' into code-refactoring-ajax-calls
add-back-migration-files
database-migration-completed
database-migration-completed-p2
use-userDBInfo
display-bidding-info-on-selling-page
Merge branch 'code-refactoring-ajax-calls'

Conflicts:
	protected/migrations/m131218_122539_create_user_table.php