update 090613
Merge branch 'master' of https://github.com/khuducanh/PostByUs

Conflicts:
	application/controllers/faceConnect.php