modal window html/css in user page& profile page
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  modal window html/css in user page& profile page

Conflicts:
	src/SocialNwk/Photographer/static/css/style.css