resolve conflicts, integrate,

image on click : accurate section, image, info

resolve conflicts:
	parse/cloud/views/user.ejs
	parse/public/javascripts/facebook.js
	parse/public/javascripts/main.js
resolve conflict

resolve conflict:
user.ejs
facebook.js
main.js