fix
Merge branch 'master' of https://github.com/huynt57/bluebee.com

Conflicts:
	protected/views/document/partial/upload.php