Merge pull request #61 from leituo56/dev-xiaoli

add "check follow" and "edit profile" buttons on user page
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  edit_profile url update
changed user page info part, fixed filter icon color bug, styling
Merge pull request #62 from leituo56/dev_jenn2

changed user page info part, fixed filter icon color bug, styling
Documentation and APIs:
markdown
Merge pull request #63 from leituo56/Wenjia

Documentation and APIs:
# Documentation and APIs
update
Merge pull request #64 from leituo56/Wenjia

# Documentation and APIs
styling for feed page, find friends page
Merge pull request #65 from leituo56/dev_jenn2

styling for feed page, find friends page
Merge branch 'dev-xiaoli'

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

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