add fb profile pic and new pics
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/com.aptana.editor.php.prefs
Merge branch 'master' of https://github.com/enjoy2000/hoaxinh