example for get login user id
example for get login user id
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Profiles functionality. Re-syncdb needed
add a profile serializer
add new permissions
Edit profile via put request.
add a sample html view
add a default head jpeg pic
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
added scroll-tracking category bar on explore
Merge pull request #40 from leituo56/dev_jenn2

added scroll-tracking category bar on explore
Merge branch 'master' of https://github.com/leituo56/SocialNetworkArtist_CMPE272_Group6
Clean Code, and add a few comments
Clean Code, and add a few comments
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Merge pull request #41 from leituo56/Dev_TuoLei

Dev tuo lei
add category icons (grey&white) in static/images folder
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  add category icons (grey&white) in static/images folder

Conflicts:
	src/SocialNwk/Photographer/static/photo_load.js
Merge pull request #42 from leituo56/sammie_visualization

add visualization css into site_stat.css
add icon yellow sets
Merge pull request #43 from leituo56/dev-xiaoli

add icon yellow sets
Merge pull request #44 from leituo56/sammie_visualization

edit stat_visualization
add xiaoli's icons to explore page
Merge pull request #45 from leituo56/dev_jenn2

add xiaoli's icons to explore page
drop down menu, fix icon link
Merge pull request #46 from leituo56/dev-xiaoli

drop down menu, fix icon link