Merge pull request #82 from leituo56/Dev_TuoLei

Dev tuo lei
Merge pull request #83 from leituo56/Dev_TuoLei

Default make and model
move alert in upload
change bar style with no data passing
Merge pull request #84 from leituo56/sammie_visualization

change bar style with no data passing
styling changes to user page (modals), explore, find friends, profile, upload pages
Merge pull request #85 from leituo56/dev_jenn2

styling changes to user page (modals), explore, find friends, profile and
refactor visualization
visualization data with bar chart
Merge pull request #86 from leituo56/sammie_visualization

Sammie visualization : data with bar chart
change bar color
Merge pull request #87 from leituo56/sammie_visualization

change bar color
fixed floating bar pos, added 'top' to floating filter bar
Merge pull request #88 from leituo56/dev_jenn2

fixed floating bar pos, added 'top' to floating filter bar
Pie Charts in site_stat page. add logo images in static/images/
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  Pie Charts in site_stat page. add logo images in static/images/

Conflicts:
	src/SocialNwk/Photographer/static/site_stat.js
fix percantage in bar chart
Merge pull request #89 from leituo56/sammie_visualization

fix percantage in bar chart
load photos to site_stat page
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  load photos to site_stat page